summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Jon McCann <jmccann@redhat.com>2008-05-14 22:59:18 +0000
committerWilliam Jon McCann <mccann@src.gnome.org>2008-05-14 22:59:18 +0000
commit406a1730e05f3ced837228ab05d9dfb915de9dca (patch)
tree25b9375ac5e7174e7cce3be584c12cd5f1c297ee
parent73be5d7ad211a91928e4622049e1e96bcd76d86f (diff)
downloadgnome-settings-daemon-406a1730e05f3ced837228ab05d9dfb915de9dca.tar.gz
Bummer. Revert part of last commit.
2008-05-14 William Jon McCann <jmccann@redhat.com> * plugins/mouse/gsd-mouse-manager.c (filter): Bummer. Revert part of last commit. svn path=/trunk/; revision=343
-rw-r--r--ChangeLog5
-rw-r--r--plugins/mouse/gsd-mouse-manager.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d59a358b..cd950694 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
2008-05-14 William Jon McCann <jmccann@redhat.com>
* plugins/mouse/gsd-mouse-manager.c (filter):
+ Bummer. Revert part of last commit.
+
+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>
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index ba9fb73b..763da6ec 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -431,6 +431,8 @@ filter (GdkXEvent *xevent,
XAllowEvents (xev->xkey.display,
ReplayKeyboard,
xev->xkey.time);
+ XUngrabKeyboard (gdk_x11_get_default_xdisplay (),
+ xev->xkey.time);
}
}
return GDK_FILTER_CONTINUE;