rpms/gnome-settings-daemon
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

only spawn one syndaemon

Browse Source
This commit is contained in:
Matthias Clasen 2009-06-16 04:39:05 +00:00
parent a5eb3b776f
commit db41ce093e
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnome-settings-daemon.spec
View File

@ -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@redhat.com> 2.27.1-2
* Tue Jun 16 2009 Matthias Clasen <mclasen@redhat.com> 2.26.1-7
- Only spawn one syndaemon
* Mon Jun 8 2009 Matthias Clasen <mclasen@redhat.com> 2.26.1-6
- Make the 'locate pointer' effect cope with changing compositing
managers

13
there-can-be-only-one.patch Normal file
View File

@ -0,0 +1,13 @@
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";