diff options
author | Laurent Contzen <lcontzen@gmail.com> | 2012-07-04 17:59:15 +0800 |
---|---|---|
committer | Laurent Contzen <lcontzen@gmail.com> | 2012-07-23 15:48:42 +0800 |
commit | 87511314e60d6a9c67caaed5d5fd2e3f2f3657c8 (patch) | |
tree | 4fae80b9a44c02e2f572cf486f87591ed1e64636 /src | |
parent | 3ba0b1109440fc6b1bd7f196c14aa5fe44ff1884 (diff) | |
download | gsoc2013-empathy-87511314e60d6a9c67caaed5d5fd2e3f2f3657c8.tar.gz gsoc2013-empathy-87511314e60d6a9c67caaed5d5fd2e3f2f3657c8.tar.zst gsoc2013-empathy-87511314e60d6a9c67caaed5d5fd2e3f2f3657c8.zip |
empathy-roster-view: start using empathy-roster-model
https://bugzilla.gnome.org/show_bug.cgi?id=680302
Diffstat (limited to 'src')
-rw-r--r-- | src/empathy-roster-window.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c index b292bf976..2b7f98a2c 100644 --- a/src/empathy-roster-window.c +++ b/src/empathy-roster-window.c @@ -49,6 +49,8 @@ #include <libempathy-gtk/empathy-gtk-enum-types.h> #include <libempathy-gtk/empathy-individual-dialogs.h> #include <libempathy-gtk/empathy-individual-store-manager.h> +#include <libempathy-gtk/empathy-roster-model.h> +#include <libempathy-gtk/empathy-roster-model-manager.h> #include <libempathy-gtk/empathy-roster-view.h> #include <libempathy-gtk/empathy-new-message-dialog.h> #include <libempathy-gtk/empathy-new-call-dialog.h> @@ -2118,6 +2120,7 @@ empathy_roster_window_init (EmpathyRosterWindow *self) gchar *filename; GtkWidget *search_vbox; guint i; + EmpathyRosterModel *model; self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EMPATHY_TYPE_ROSTER_WINDOW, EmpathyRosterWindowPriv); @@ -2218,6 +2221,8 @@ empathy_roster_window_init (EmpathyRosterWindow *self) self->priv->individual_manager = empathy_individual_manager_dup_singleton (); + model = EMPATHY_ROSTER_MODEL (empathy_roster_model_manager_new (self->priv->individual_manager)); + if (!empathy_individual_manager_get_contacts_loaded ( self->priv->individual_manager)) { @@ -2228,7 +2233,10 @@ empathy_roster_window_init (EmpathyRosterWindow *self) } self->priv->view = EMPATHY_ROSTER_VIEW ( - empathy_roster_view_new (self->priv->individual_manager)); + empathy_roster_view_new (self->priv->individual_manager, + model)); + + g_object_unref (model); gtk_widget_show (GTK_WIDGET (self->priv->view)); |