[Xfce4-commits] <libxfce4ui:jeromeg/keyboard-shortcuts> No need to remove consumed modifiers twice.

[Jérôme Guelfucci]

Updating branch refs/heads/jeromeg/keyboard-shortcuts
         to 927438b9ce57253d705a846725892935d02f9f1f (commit)
       from 0da716be5ecc87bcc74c5ea40b14b8f93c0d7d73 (commit)

commit 927438b9ce57253d705a846725892935d02f9f1f
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 dd13f7e..7f194f2 100644
--- a/libxfce4kbd-private/xfce-shortcuts-grabber.c
+++ b/libxfce4kbd-private/xfce-shortcuts-grabber.c
@@ -432,7 +432,6 @@ struct EventKeyFindContext
 {
   XfceShortcutsGrabber *grabber;
   GdkModifierType       modifiers;
-  GdkModifierType       consumed;
   guint                 keyval;
   const gchar          *result;
 };
@@ -448,7 +447,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))
     {
@@ -512,7 +511,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);