Merge branch 'sasl'

[empathy.git] / libempathy-gtk / empathy-contact-list-view.c

diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 11c9e78a2179cafd183d3e91ef08298677b3c522..1b11309f3f150efd8047dab08b48afd3479ec152 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -763,11 +763,9 @@ contact_list_view_drag_data_get (GtkWidget        *widget,
        g_object_unref (contact);
        str = g_strconcat (account_id, ":", contact_id, NULL);
 
-       switch (info) {
-       case DND_DRAG_TYPE_CONTACT_ID:
+       if (info == DND_DRAG_TYPE_CONTACT_ID) {
                gtk_selection_data_set (selection, drag_atoms_source[info], 8,
                                        (guchar *) str, strlen (str) + 1);
-               break;
        }
 
        g_free (str);
@@ -818,8 +816,6 @@ contact_list_view_popup_menu_idle_cb (gpointer user_data)
        }
 
        if (menu) {
-               g_signal_connect (menu, "deactivate",
-                                 G_CALLBACK (gtk_menu_detach), NULL);
                gtk_menu_attach_to_widget (GTK_MENU (menu),
                                           GTK_WIDGET (data->view), NULL);
                gtk_widget_show (menu);
@@ -858,7 +854,7 @@ contact_list_view_key_press_event_cb (EmpathyContactListView *view,
                                      GdkEventKey            *event,
                                      gpointer                user_data)
 {
-       if (event->keyval == GDK_Menu) {
+       if (event->keyval == GDK_KEY_Menu) {
                MenuPopupData *data;
 
                data = g_slice_new (MenuPopupData);
@@ -894,7 +890,7 @@ contact_list_view_row_activated (GtkTreeView       *view,
        if (contact) {
                DEBUG ("Starting a chat");
                empathy_dispatcher_chat_with_contact (contact,
-                       gtk_get_current_event_time (), NULL, NULL);
+                       gtk_get_current_event_time ());
                g_object_unref (contact);
        }
 }
@@ -938,8 +934,6 @@ contact_list_view_call_activated_cb (
        gtk_menu_shell_append (shell, item);
        gtk_widget_show (item);
 
-       g_signal_connect (menu, "deactivate",
-                         G_CALLBACK (gtk_menu_detach), NULL);
        gtk_menu_attach_to_widget (GTK_MENU (menu),
                                   GTK_WIDGET (view), NULL);
        gtk_widget_show (menu);
@@ -1276,22 +1270,26 @@ contact_list_view_search_activate_cb (GtkWidget *search,
        }
 }
 
-static void
+static gboolean
 contact_list_view_search_key_navigation_cb (GtkWidget *search,
-                                           gpointer eventkey,
+                                           GdkEvent *event,
                                            EmpathyContactListView *view)
 {
-       GdkEventKey *event = ((GdkEventKey *) eventkey);
-       if (event->keyval == GDK_Up || event->keyval == GDK_Down) {
+       GdkEventKey *eventkey = ((GdkEventKey *) event);
+       gboolean ret = FALSE;
+
+       if (eventkey->keyval == GDK_KEY_Up || eventkey->keyval == GDK_KEY_Down) {
                GdkEvent *new_event;
 
-               new_event = gdk_event_copy ((GdkEvent *) event);
+               new_event = gdk_event_copy (event);
                gtk_widget_grab_focus (GTK_WIDGET (view));
-               gtk_widget_event (GTK_WIDGET (view), new_event);
+               ret = gtk_widget_event (GTK_WIDGET (view), new_event);
                gtk_widget_grab_focus (search);
 
                gdk_event_free (new_event);
        }
+
+       return ret;
 }
 
 static void