[Xfce4-commits] <libxfce4ui:xfce-4.10> No need to remove consumed modifiers twice.

[Jérôme Guelfucci]

Updating branch refs/heads/xfce-4.10
         to 8733e8a022c3c9c700dbd9cabfb39051ae6fbf81 (commit)
       from 9b7bd5473a0057deeaba8016c8497a9cdc0fd53b (commit)

commit 8733e8a022c3c9c700dbd9cabfb39051ae6fbf81
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Tue Dec 18 09:03:38 2012 +0100

    No need to remove consumed modifiers twice.

 libxfce4kbd-private/xfce-shortcuts-grabber.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/libxfce4kbd-private/xfce-shortcuts-grabber.c b/libxfce4kbd-private/xfce-shortcuts-grabber.c
index a5801d3..1a9bccf 100644
--- a/libxfce4kbd-private/xfce-shortcuts-grabber.c
+++ b/libxfce4kbd-private/xfce-shortcuts-grabber.c
@@ -429,7 +429,6 @@ struct EventKeyFindContext
 {
   XfceShortcutsGrabber *grabber;
   GdkModifierType       modifiers;
-  GdkModifierType       consumed;
   guint                 keyval;
   const gchar          *result;
 };
@@ -445,7 +444,7 @@ find_event_key (const gchar                *shortcut,
 
   TRACE ("Comparing to %s", shortcut);
 
-  if ((key->modifiers & ~context->consumed & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK))
+  if ((key->modifiers & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK))
       == (context->modifiers)
       && (key->keyval == context->keyval))
     {
@@ -509,7 +508,6 @@ xfce_shortcuts_grabber_event_filter (GdkXEvent            *gdk_xevent,
 
   context.keyval = keyval;
   context.modifiers = modifiers;
-  context.consumed = consumed;
 
   raw_shortcut_name = gtk_accelerator_name (keyval, modifiers);
   gtk_accelerator_parse (raw_shortcut_name, &context.keyval, &context.modifiers);