[totem] main: Don't handle additional modifiers on top of Ctrl+F



commit c743033cf21ff8f9b94ee02bcac8b3c16b76f9d8
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Mar 28 01:37:06 2014 +0100

    main: Don't handle additional modifiers on top of Ctrl+F
    
    Alt+Ctrl+F shouldn't pop out the search bar.

 src/totem-grilo.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/totem-grilo.c b/src/totem-grilo.c
index f2db80d..9d44ece 100644
--- a/src/totem-grilo.c
+++ b/src/totem-grilo.c
@@ -1614,13 +1614,16 @@ window_key_press_event_cb (GtkWidget   *win,
                           GdkEventKey *event,
                           TotemGrilo  *self)
 {
+       guint state;
+
        /* Check whether we're in the browse panel */
        if (!g_str_equal (totem_object_get_main_page (self->priv->totem), "grilo"))
                return GDK_EVENT_PROPAGATE;
 
+       state = event->state & gtk_accelerator_get_default_mod_mask ();
+
        /* Handle Ctrl+F */
-       if (event->state != 0 &&
-           (event->state & GDK_CONTROL_MASK)) {
+       if (state == GDK_CONTROL_MASK) {
                if (event->keyval == GDK_KEY_F ||
                    event->keyval == GDK_KEY_f) {
                        gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (self->priv->search_bar),


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]