main-window: use the EmpathyIndividual flavor of some types
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 8 Nov 2011 15:09:44 +0000 (16:09 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 14 Nov 2011 09:29:46 +0000 (10:29 +0100)
We switched to EmpathyIndividualView a while ago...

https://bugzilla.gnome.org/show_bug.cgi?id=663387

https://bugzilla.gnome.org/show_bug.cgi?id=663763

src/empathy-main-window.c

index fe39ca454ffcdf4d260455fe6a08781fe7111d68..367ae067f6b9829f331ce73359c30fc1be7fd109 100644 (file)
@@ -47,8 +47,6 @@
 #include <libempathy/empathy-tp-contact-factory.h>
 
 #include <libempathy-gtk/empathy-contact-dialogs.h>
-#include <libempathy-gtk/empathy-contact-list-store.h>
-#include <libempathy-gtk/empathy-contact-list-view.h>
 #include <libempathy-gtk/empathy-live-search.h>
 #include <libempathy-gtk/empathy-contact-blocking-dialog.h>
 #include <libempathy-gtk/empathy-contact-search-dialog.h>
@@ -569,7 +567,7 @@ main_window_load_events_idle_cb (gpointer user_data)
 }
 
 static void
-main_window_row_activated_cb (EmpathyContactListView *view,
+main_window_row_activated_cb (EmpathyIndividualView *view,
                              GtkTreePath            *path,
                              GtkTreeViewColumn      *col,
                              EmpathyMainWindow      *window)
@@ -1519,7 +1517,7 @@ main_window_view_sort_contacts_cb (GtkRadioAction    *action,
                                   EmpathyMainWindow *window)
 {
        EmpathyMainWindowPriv *priv = GET_PRIV (window);
-       EmpathyContactListStoreSort value;
+       EmpathyIndividualStoreSort value;
        GSList      *group;
        GType        type;
        GEnumClass  *enum_class;