From b34c39368800754c96f552f4aa502e2f0b4ffba2 Mon Sep 17 00:00:00 2001 From: xclaesse Date: Fri, 30 Jan 2009 17:35:35 +0000 Subject: Pass an EmpathyContactList to _new and create the store from that. Signed-off-by: Jonny Lamb git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@2355 4ee84921-47dd-4033-b63a-18d7a039a3e4 --- libempathy-gtk/empathy-contact-selector.c | 8 ++++++-- libempathy-gtk/empathy-contact-selector.h | 2 +- tests/empetit.c | 5 +---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libempathy-gtk/empathy-contact-selector.c b/libempathy-gtk/empathy-contact-selector.c index cfd1f733a..df5384ace 100644 --- 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 238cbbbb9..d766c5a62 100644 --- 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 2c05fd089..43fddcbe2 100644 --- 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; -- cgit v1.2.3