Commit 3c5f909c authored by Jonny Lamb's avatar Jonny Lamb Committed by Xavier Claessens

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

Signed-off-by: 's avatarJonny Lamb <jonny.lamb@collabora.co.uk>

svn path=/trunk/; revision=2355
parent 0de2b569
......@@ -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));
}
......
......@@ -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);
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment