gnome-settings-daemon r341 - in trunk: . plugins/mouse

[mccann svn gnome org]

Author: mccann
Date: Wed May 14 22:02:52 2008
New Revision: 341
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=341&view=rev

Log:
2008-05-14  William Jon McCann  <jmccann redhat com>

	* plugins/mouse/gsd-mouse-manager.c (filter):
	Don't eat keypresses for multimedia key events
	Patch by Bastien Nocera  <hadess hadess net>



Modified:
   trunk/ChangeLog
   trunk/plugins/mouse/gsd-mouse-manager.c

Modified: trunk/plugins/mouse/gsd-mouse-manager.c
==============================================================================
--- trunk/plugins/mouse/gsd-mouse-manager.c	(original)
+++ trunk/plugins/mouse/gsd-mouse-manager.c	Wed May 14 22:02:52 2008
@@ -418,21 +418,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;