Always forward to the view keynav events, since we get them only if they are useless...

diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 03839abbe29926517e5d52afe283e038cec53b35..2b0b51a36af7228428d10852c6625ed59644f78d 100644 (file)
--- 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 dbd8f336bcae67d5480c078177d839afb083d526..b5c5022e9df32db31f6e817a1cf5782bfb00dcfc 100644 (file)
--- 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;
 }