aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2011-05-20 21:18:10 +0800
committerXavier Claessens <xclaesse@gmail.com>2011-05-20 21:43:44 +0800
commit12c7f7de95068377ff60b23bdc5d80367d554c2b (patch)
tree57c91880402e644cf5ccc362a62de2f5fb7915b9
parentee227ec984e99ab5f1046c68b891413ba1b89507 (diff)
downloadgsoc2013-empathy-12c7f7de95068377ff60b23bdc5d80367d554c2b.tar
gsoc2013-empathy-12c7f7de95068377ff60b23bdc5d80367d554c2b.tar.gz
gsoc2013-empathy-12c7f7de95068377ff60b23bdc5d80367d554c2b.tar.bz2
gsoc2013-empathy-12c7f7de95068377ff60b23bdc5d80367d554c2b.tar.lz
gsoc2013-empathy-12c7f7de95068377ff60b23bdc5d80367d554c2b.tar.xz
gsoc2013-empathy-12c7f7de95068377ff60b23bdc5d80367d554c2b.tar.zst
gsoc2013-empathy-12c7f7de95068377ff60b23bdc5d80367d554c2b.zip
Always forward to the view keynav events, since we get them only if they are useless to the entry anyway
-rw-r--r--libempathy-gtk/empathy-contact-list-view.c16
-rw-r--r--libempathy-gtk/empathy-individual-view.c18
2 files changed, 12 insertions, 22 deletions
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 03839abbe..2b0b51a36 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -1283,19 +1283,15 @@ contact_list_view_search_key_navigation_cb (GtkWidget *search,
GdkEvent *event,
EmpathyContactListView *view)
{
- GdkEventKey *eventkey = ((GdkEventKey *) event);
+ GdkEvent *new_event;
gboolean ret = FALSE;
- if (eventkey->keyval == GDK_KEY_Up || eventkey->keyval == GDK_KEY_Down) {
- GdkEvent *new_event;
+ new_event = gdk_event_copy (event);
+ gtk_widget_grab_focus (GTK_WIDGET (view));
+ ret = gtk_widget_event (GTK_WIDGET (view), new_event);
+ gtk_widget_grab_focus (search);
- new_event = gdk_event_copy (event);
- gtk_widget_grab_focus (GTK_WIDGET (view));
- ret = gtk_widget_event (GTK_WIDGET (view), new_event);
- gtk_widget_grab_focus (search);
-
- gdk_event_free (new_event);
- }
+ gdk_event_free (new_event);
return ret;
}
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index dbd8f336b..b5c5022e9 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -1409,21 +1409,15 @@ individual_view_search_key_navigation_cb (GtkWidget *search,
GdkEvent *event,
EmpathyIndividualView *view)
{
- GdkEventKey *eventkey = ((GdkEventKey *) event);
+ GdkEvent *new_event;
gboolean ret = FALSE;
- if (eventkey->keyval == GDK_KEY_Up || eventkey->keyval == GDK_KEY_Down
- || eventkey->keyval == GDK_KEY_F2)
- {
- GdkEvent *new_event;
-
- new_event = gdk_event_copy (event);
- gtk_widget_grab_focus (GTK_WIDGET (view));
- ret = gtk_widget_event (GTK_WIDGET (view), new_event);
- gtk_widget_grab_focus (search);
+ new_event = gdk_event_copy (event);
+ gtk_widget_grab_focus (GTK_WIDGET (view));
+ ret = gtk_widget_event (GTK_WIDGET (view), new_event);
+ gtk_widget_grab_focus (search);
- gdk_event_free (new_event);
- }
+ gdk_event_free (new_event);
return ret;
}