rpms/gnome-settings-daemon/F-11 there-can-be-only-one.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.105, 1.106

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26034

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	there-can-be-only-one.patch 
Log Message:
only spawn one syndaemon


there-can-be-only-one.patch:

--- NEW FILE there-can-be-only-one.patch ---
diff -up gnome-settings-daemon-2.26.1/plugins/mouse/gsd-mouse-manager.c.multi-syndaemon gnome-settings-daemon-2.26.1/plugins/mouse/gsd-mouse-manager.c
--- gnome-settings-daemon-2.26.1/plugins/mouse/gsd-mouse-manager.c.multi-syndaemon	2009-06-16 00:35:48.189419930 -0400
+++ gnome-settings-daemon-2.26.1/plugins/mouse/gsd-mouse-manager.c	2009-06-16 00:36:26.235415380 -0400
@@ -504,6 +504,9 @@ set_disable_w_typing (GsdMouseManager *m
 	if (state) {
 		char	*args[4];
 
+                if (manager->priv->syndaemon_spawned)
+                        return 0;
+
 		args[0] = "syndaemon";
 		args[1] = "-i";
 		args[2] = "0.5";


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-11/gnome-settings-daemon.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- gnome-settings-daemon.spec	9 Jun 2009 02:12:46 -0000	1.105
+++ gnome-settings-daemon.spec	16 Jun 2009 04:39:05 -0000	1.106
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.26.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -49,6 +49,8 @@ Patch14:	gsd-xkb-init.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=585209
 Patch15:        composited-changed.patch
 
+Patch16:	there-can-by-only-one.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -73,6 +75,7 @@ developing applications that use %{name}
 %patch13 -p1 -b .compare-keys-carefully
 %patch14 -p1 -b .xkb-init
 %patch15 -p1 -b .composited-changed
+%patch16 -p1 -b .multi-syndaemon
 
 autoreconf -i -f
 
@@ -185,7 +188,10 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
-* Mon Jun  8 2009 Matthias Clasen <mclasen at redhat.com> 2.27.1-2
+* Tue Jun 16 2009 Matthias Clasen <mclasen at redhat.com> 2.26.1-7
+- Only spawn one syndaemon
+
+* Mon Jun  8 2009 Matthias Clasen <mclasen at redhat.com> 2.26.1-6
 - Make the 'locate pointer' effect cope with changing compositing
   managers