From 9b9fcd3ce3b9c7fdc62836821d83377bec58d0a5 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 4 Mar 2009 11:41:28 +0100 Subject: Change EmpathyTpContactFactory API to look more like TpConnection. Add function to get only one contact from id/handle. --- libempathy-gtk/empathy-contact-widget.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'libempathy-gtk/empathy-contact-widget.c') diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index df876b603..18d7f415a 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -690,13 +690,20 @@ contact_widget_contact_update (EmpathyContactWidget *information) static void contact_widget_got_contact_cb (EmpathyTpContactFactory *factory, - GList *contacts, + EmpathyContact *contact, + const GError *error, gpointer user_data, GObject *weak_object) { EmpathyContactWidget *information = user_data; - contact_widget_set_contact (information, contacts->data); + if (error != NULL) + { + DEBUG ("Error: %s", error->message); + return; + } + + contact_widget_set_contact (information, contact); } static void @@ -715,7 +722,7 @@ contact_widget_get_self_handle_cb (TpConnection *connection, } factory = empathy_tp_contact_factory_dup_singleton (connection); - empathy_tp_contact_factory_get_from_handles (factory, 1, &self_handle, + empathy_tp_contact_factory_get_from_handle (factory, self_handle, contact_widget_got_contact_cb, information, NULL, weak_object); g_object_unref (factory); @@ -741,7 +748,7 @@ contact_widget_change_contact (EmpathyContactWidget *information) EmpathyTpContactFactory *factory; factory = empathy_tp_contact_factory_dup_singleton (connection); - empathy_tp_contact_factory_get_from_ids (factory, 1, &id, + empathy_tp_contact_factory_get_from_id (factory, id, contact_widget_got_contact_cb, information, NULL, G_OBJECT (information->vbox_contact_widget)); g_object_unref (factory); -- cgit v1.2.3