aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-08 23:09:44 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-14 17:29:46 +0800
commit65d16f797d9d3d7c5e46ef46790d13197f21cc9e (patch)
tree4d7943e1c24430aa5514c2190dcc5b332885ceac
parentbd386d11c3080878821aae39e6f3f1c0b9db5222 (diff)
downloadgsoc2013-empathy-65d16f797d9d3d7c5e46ef46790d13197f21cc9e.tar
gsoc2013-empathy-65d16f797d9d3d7c5e46ef46790d13197f21cc9e.tar.gz
gsoc2013-empathy-65d16f797d9d3d7c5e46ef46790d13197f21cc9e.tar.bz2
gsoc2013-empathy-65d16f797d9d3d7c5e46ef46790d13197f21cc9e.tar.lz
gsoc2013-empathy-65d16f797d9d3d7c5e46ef46790d13197f21cc9e.tar.xz
gsoc2013-empathy-65d16f797d9d3d7c5e46ef46790d13197f21cc9e.tar.zst
gsoc2013-empathy-65d16f797d9d3d7c5e46ef46790d13197f21cc9e.zip
main-window: use the EmpathyIndividual flavor of some types
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
-rw-r--r--src/empathy-main-window.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index fe39ca454..367ae067f 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -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;