rpms/gnome-settings-daemon/devel gsd-mouse-too-much-grab.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.18, 1.19

Bastien Nocera (hadess) fedora-extras-commits at redhat.com
Wed Mar 26 16:02:16 UTC 2008


Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14048

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	gsd-mouse-too-much-grab.patch 
Log Message:
* Wed Mar 26 2008 - Bastien Nocera <bnocera at redhat.com> - 2.22.1-0.2008.03.26.3
- Add patch for the mouse plugin not to eat multimedia key events (#438942)


gsd-mouse-too-much-grab.patch:

--- NEW FILE gsd-mouse-too-much-grab.patch ---
Index: gsd-mouse-manager.c
===================================================================
--- gsd-mouse-manager.c	(revision 234)
+++ gsd-mouse-manager.c	(working copy)
@@ -424,21 +424,19 @@
                                                      NULL, NULL, NULL);
                 if (keyval == GDK_Control_L || keyval == GDK_Control_R) {
                         if (xev->type == KeyPress) {
-                                XAllowEvents (gdk_x11_get_default_xdisplay (),
+                                XAllowEvents (xev->xkey.display,
                                               SyncKeyboard,
                                               xev->xkey.time);
                         } else {
-                                XAllowEvents (gdk_x11_get_default_xdisplay (),
+                                XAllowEvents (xev->xkey.display,
                                               AsyncKeyboard,
                                               xev->xkey.time);
                                 gsd_locate_pointer (screen);
                         }
                 } else {
-                        XAllowEvents (gdk_x11_get_default_xdisplay (),
+                        XAllowEvents (xev->xkey.display,
                                       ReplayKeyboard,
                                       xev->xkey.time);
-                        XUngrabKeyboard (gdk_x11_get_default_xdisplay (),
-                                         xev->xkey.time);
                 }
         }
         return GDK_FILTER_CONTINUE;


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome-settings-daemon.spec	26 Mar 2008 15:50:20 -0000	1.18
+++ gnome-settings-daemon.spec	26 Mar 2008 16:01:40 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.22.1
-Release:	0.2008.03.26.2%{?dist}
+Release:	0.2008.03.26.3%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -30,6 +30,9 @@
 
 Patch1:         add-randr-12.patch
 Patch2:         gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=438942
+# http://bugzilla.gnome.org/show_bug.cgi?id=524499
+Patch3:         gsd-mouse-too-much-grab.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -51,6 +54,9 @@
 
 %patch1 -p1 -b .add-randr-12
 %patch2 -p1 -b .ignore-layout-if-using-evdev
+pushd plugins/mouse/
+%patch3 -p0 -b .no-eat-keys
+popd
 
 %build
 %configure --enable-static=no --enable-profiling
@@ -132,6 +138,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Mar 26 2008 - Bastien Nocera <bnocera at redhat.com> - 2.22.1-0.2008.03.26.3
+- Add patch for the mouse plugin not to eat multimedia key events (#438942)
+
 * Wed Mar 26 2008 Jon McCann <jmccann at redhat.com> - 2.22.1-0.2008.03.26.2
 - Rebuild
 




More information about the fedora-extras-commits mailing list