Commit 286fff4e authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

gtk: use GTK_NO_TEXT_INPUT_MOD_MASK also in gtkfilechooserdefault.c

(cherry picked from commit b057a311e76a90a120ca0e9597bedeb9fc89b0b2)
parent 24a42839
......@@ -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))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment