diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-09-29 21:45:08 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-10-04 16:41:29 +0800 |
commit | b70f96a527146903d637ef75434423da9a5b7468 (patch) | |
tree | f8bc2988ba8b36c34245ab0b92c481a0ba5d5ed4 /libempathy-gtk/empathy-live-search.c | |
parent | 23535a4ce054f952aa31012bbbc2fd894ba77ecd (diff) | |
download | gsoc2013-empathy-b70f96a527146903d637ef75434423da9a5b7468.tar gsoc2013-empathy-b70f96a527146903d637ef75434423da9a5b7468.tar.gz gsoc2013-empathy-b70f96a527146903d637ef75434423da9a5b7468.tar.bz2 gsoc2013-empathy-b70f96a527146903d637ef75434423da9a5b7468.tar.lz gsoc2013-empathy-b70f96a527146903d637ef75434423da9a5b7468.tar.xz gsoc2013-empathy-b70f96a527146903d637ef75434423da9a5b7468.tar.zst gsoc2013-empathy-b70f96a527146903d637ef75434423da9a5b7468.zip |
GDK keys are now GDK_KEY_*
Diffstat (limited to 'libempathy-gtk/empathy-live-search.c')
-rw-r--r-- | libempathy-gtk/empathy-live-search.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c index d058b5751..a607939f3 100644 --- a/libempathy-gtk/empathy-live-search.c +++ b/libempathy-gtk/empathy-live-search.c @@ -255,15 +255,15 @@ live_search_entry_key_pressed_cb (GtkEntry *entry, gboolean ret; /* if esc key pressed, hide the search */ - if (event->keyval == GDK_Escape) + if (event->keyval == GDK_KEY_Escape) { gtk_widget_hide (GTK_WIDGET (self)); return TRUE; } /* emit key navigation signal, so other widgets can respond to it properly */ - if (event->keyval == GDK_Up || event->keyval == GDK_Down - || event->keyval == GDK_Left || event->keyval == GDK_Right) + if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down + || event->keyval == GDK_KEY_Left || event->keyval == GDK_KEY_Right) { g_signal_emit (self, signals[KEYNAV], 0, event, &ret); return ret; @@ -319,20 +319,20 @@ live_search_key_press_event_cb (GtkWidget *widget, /* dont forward this event to the entry, else the event is consumed by the * entry and does not close the window */ if (!gtk_widget_get_visible (GTK_WIDGET (self)) && - event->keyval == GDK_Escape) + event->keyval == GDK_KEY_Escape) return FALSE; /* do not show the search if CTRL and/or ALT are pressed with a key * this is needed, because otherwise the CTRL + F accel would not work, * because the entry consumes it */ if (event->state & (GDK_MOD1_MASK | GDK_CONTROL_MASK) || - event->keyval == GDK_Control_L || - event->keyval == GDK_Control_R) + event->keyval == GDK_KEY_Control_L || + event->keyval == GDK_KEY_Control_R) return FALSE; /* dont forward the up and down arrow keys to the entry, they are needed for * navigation in the treeview and are not needed in the search entry */ - if (event->keyval == GDK_Up || event->keyval == GDK_Down) + if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down) return FALSE; /* realize the widget if it is not realized yet */ |