From 286fff4e5f0ec5964c974b0efc44ff2a7c5181db Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@lanedo.com>
Date: Sat, 17 Sep 2011 15:25:02 +0200
Subject: [PATCH] gtk: use GTK_NO_TEXT_INPUT_MOD_MASK also in
 gtkfilechooserdefault.c (cherry picked from commit
 b057a311e76a90a120ca0e9597bedeb9fc89b0b2)

---
 gtk/gtkfilechooserdefault.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 9901eaba57..07ed02c0d8 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -3724,18 +3724,15 @@ browse_files_key_press_event_cb (GtkWidget   *widget,
 				 gpointer     data)
 {
   GtkFileChooserDefault *impl;
-  int modifiers;
 
   impl = (GtkFileChooserDefault *) data;
 
-  modifiers = gtk_accelerator_get_default_mod_mask ();
-
   if ((event->keyval == GDK_KEY_slash
        || event->keyval == GDK_KEY_KP_Divide
 #ifdef G_OS_UNIX
        || event->keyval == GDK_KEY_asciitilde
 #endif
-       ) && ! (event->state & (~GDK_SHIFT_MASK & modifiers)))
+       ) && !(event->state & GTK_NO_TEXT_INPUT_MOD_MASK))
     {
       location_popup_handler (impl, event->string);
       return TRUE;
@@ -3752,7 +3749,7 @@ browse_files_key_press_event_cb (GtkWidget   *widget,
        || event->keyval == GDK_KEY_KP_Enter
        || event->keyval == GDK_KEY_space
        || event->keyval == GDK_KEY_KP_Space)
-      && ((event->state & modifiers) == 0)
+      && !(event->state & gtk_accelerator_get_default_mod_mask ())
       && !(impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
 	   impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
     {