[gthumb] shortcuts: apply the mod mask in a single place

[Paolo Bacchilega <paobac src gnome org>]

commit 0dad02e9d7d25f099535b67032b2cf673f8b9c0f
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Nov 17 09:59:45 2019 +0100

    shortcuts: apply the mod mask in a single place

 gthumb/gth-browser.c | 8 ++------
 gthumb/gth-window.c  | 1 +
 2 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/gthumb/gth-browser.c b/gthumb/gth-browser.c
index e8a04ce7..1efd4b1e 100644
--- a/gthumb/gth-browser.c
+++ b/gthumb/gth-browser.c
@@ -3730,14 +3730,12 @@ static gboolean
 gth_browser_file_list_key_press_cb (GthBrowser  *browser,
                                    GdkEventKey *event)
 {
-       guint    modifiers;
        gboolean activated;
 
-       modifiers = gtk_accelerator_get_default_mod_mask ();
        activated = gth_window_activate_shortcut (GTH_WINDOW (browser),
                                                  GTH_SHORTCUT_CONTEXT_BROWSER,
                                                  event->keyval,
-                                                 (event->state & modifiers));
+                                                 event->state);
 
        if (! activated)
                activated = gth_hook_invoke_get ("gth-browser-file-list-key-press", browser, event) != NULL;
@@ -5687,16 +5685,14 @@ gboolean
 gth_browser_viewer_key_press_cb (GthBrowser  *browser,
                                 GdkEventKey *event)
 {
-       guint    modifiers;
        gboolean activated;
 
        g_return_val_if_fail (event != NULL, FALSE);
 
-       modifiers = gtk_accelerator_get_default_mod_mask ();
        activated = gth_window_activate_shortcut (GTH_WINDOW (browser),
                                                  GTH_SHORTCUT_CONTEXT_VIEWER,
                                                  event->keyval,
-                                                 (event->state & modifiers));
+                                                 event->state);
 
        if (! activated && gtk_widget_get_realized (browser->priv->file_list))
                activated = gth_hook_invoke_get ("gth-browser-file-list-key-press", browser, event) != NULL;
diff --git a/gthumb/gth-window.c b/gthumb/gth-window.c
index 336206ca..b75b855a 100644
--- a/gthumb/gth-window.c
+++ b/gthumb/gth-window.c
@@ -892,6 +892,7 @@ gth_window_activate_shortcut (GthWindow       *window,
        gboolean     activated = FALSE;
        GthShortcut *shortcut;
 
+       modifiers = modifiers & gtk_accelerator_get_default_mod_mask ();
        shortcut = gth_shortcut_array_find (window->priv->shortcuts_v, context, keycode, modifiers);
        if (shortcut != NULL) {
                GAction *action;