Pass an EmpathyContactList to _new and create the store from that.

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=2355

diff --git a/libempathy-gtk/empathy-contact-selector.c b/libempathy-gtk/empathy-contact-selector.c
index cfd1f733a162edd0721f26708ce795c3aa1efbcb..df5384ace8da80e2a093ec21cb821bd5736d61de 100644 (file)
--- a/libempathy-gtk/empathy-contact-selector.c
+++ b/libempathy-gtk/empathy-contact-selector.c
@@ -308,9 +308,13 @@ empathy_contact_selector_class_init (EmpathyContactSelectorClass *klass)
 /* public methods */
 
 GtkWidget *
-empathy_contact_selector_new (EmpathyContactListStore *store)
+empathy_contact_selector_new (EmpathyContactList *contact_list)
 {
-  g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store), NULL);
+  EmpathyContactListStore *store;
+
+  g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (contact_list), NULL);
+
+  store = empathy_contact_list_store_new (contact_list);
 
   return GTK_WIDGET (g_object_new (EMPATHY_TYPE_CONTACT_SELECTOR, "store", store, NULL));
 }

diff --git a/libempathy-gtk/empathy-contact-selector.h b/libempathy-gtk/empathy-contact-selector.h
index 238cbbbb90e269a882f991b003ef9047d806a48f..d766c5a62d37df69070d8e56fd13db9de9f4eae1 100644 (file)
--- a/libempathy-gtk/empathy-contact-selector.h
+++ b/libempathy-gtk/empathy-contact-selector.h
@@ -59,7 +59,7 @@ struct _EmpathyContactSelectorClass
 
 GType empathy_contact_selector_get_type (void) G_GNUC_CONST;
 GtkWidget *
-empathy_contact_selector_new (EmpathyContactListStore *store);
+empathy_contact_selector_new (EmpathyContactList *contact_list);
 
 EmpathyContact *
 empathy_contact_selector_get_selected (EmpathyContactSelector *selector);

diff --git a/tests/empetit.c b/tests/empetit.c
index 2c05fd089cce6a71a3ad0922683e45c820e3d1b8..43fddcbe23aa12b8757c858de557dd20dc849986 100644 (file)
--- a/tests/empetit.c
+++ b/tests/empetit.c
@@ -53,7 +53,6 @@ int main (int argc,
           char *argv[])
 {
   EmpathyContactManager *manager;
-  EmpathyContactListStore *store;
   GtkWidget *vbox, *button, *selector;
 
   gtk_init (&argc, &argv);
@@ -61,11 +60,10 @@ int main (int argc,
   empathy_gtk_init ();
 
   manager = empathy_contact_manager_dup_singleton ();
-  store = empathy_contact_list_store_new (EMPATHY_CONTACT_LIST (manager));
+  selector = empathy_contact_selector_new (EMPATHY_CONTACT_LIST (manager));
 
   vbox = gtk_vbox_new (FALSE, 2);
 
-  selector = empathy_contact_selector_new (store);
   gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, FALSE, 5);
 
   button = gtk_button_new_with_label ("Chat");
@@ -83,7 +81,6 @@ int main (int argc,
 
   gtk_main ();
 
-  g_object_unref (store);
   g_object_unref (manager);
 
   return 0;