From b8ff75d21c1be60e6df472a35599a9e22046a92b Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Mon, 10 May 2010 12:36:28 +0200 Subject: =?UTF-8?q?Port=C2=A0to=C2=A0new=C2=A0EmpathyTpContactFactory?= =?UTF-8?q?=C2=A0API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/empathy-call-window.c | 8 ++------ src/empathy-chat-window.c | 9 ++------- src/empathy-event-manager.c | 16 ++++------------ 3 files changed, 8 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 598f483ab..40c461488 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -1257,7 +1257,7 @@ contact_avatar_changed_cb (EmpathyContact *contact, } static void -empathy_call_window_got_self_contact_cb (EmpathyTpContactFactory *factory, +empathy_call_window_got_self_contact_cb (TpConnection *connection, EmpathyContact *contact, const GError *error, gpointer user_data, GObject *weak_object) { @@ -1282,7 +1282,6 @@ empathy_call_window_setup_avatars (EmpathyCallWindow *self, if (priv->contact != NULL) { TpConnection *connection; - EmpathyTpContactFactory *factory; set_window_title (self); @@ -1294,12 +1293,9 @@ empathy_call_window_setup_avatars (EmpathyCallWindow *self, /* Retreiving the self avatar */ connection = empathy_contact_get_connection (priv->contact); - factory = empathy_tp_contact_factory_dup_singleton (connection); - empathy_tp_contact_factory_get_from_handle (factory, + empathy_tp_contact_factory_get_from_handle (connection, tp_connection_get_self_handle (connection), empathy_call_window_got_self_contact_cb, self, NULL, G_OBJECT (self)); - - g_object_unref (factory); } else { diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index d47e942f5..94717f3c8 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -856,7 +856,7 @@ chat_window_contacts_toggled_cb (GtkToggleAction *toggle_action, } static void -got_contact_cb (EmpathyTpContactFactory *factory, +got_contact_cb (TpConnection *connection, EmpathyContact *contact, const GError *error, gpointer user_data, @@ -900,7 +900,6 @@ chat_window_invite_participant_activate_cb (GtkAction *action, if (response == GTK_RESPONSE_ACCEPT) { TpConnection *connection; - EmpathyTpContactFactory *factory; const char *id; id = empathy_contact_selector_dialog_get_selected ( @@ -908,12 +907,8 @@ chat_window_invite_participant_activate_cb (GtkAction *action, if (EMP_STR_EMPTY (id)) goto out; connection = tp_channel_borrow_connection (channel); - factory = empathy_tp_contact_factory_dup_singleton (connection); - - empathy_tp_contact_factory_get_from_id (factory, id, + empathy_tp_contact_factory_get_from_id (connection, id, got_contact_cb, tp_chat, NULL, NULL); - - g_object_unref (factory); } out: diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index a7283594f..025eec564 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -624,7 +624,7 @@ event_room_channel_process_func (EventPriv *event) } static void -event_manager_muc_invite_got_contact_cb (EmpathyTpContactFactory *factory, +event_manager_muc_invite_got_contact_cb (TpConnection *connection, EmpathyContact *contact, const GError *error, gpointer user_data, @@ -665,7 +665,7 @@ event_manager_muc_invite_got_contact_cb (EmpathyTpContactFactory *factory, } static void -event_manager_ft_got_contact_cb (EmpathyTpContactFactory *factory, +event_manager_ft_got_contact_cb (TpConnection *connection, EmpathyContact *contact, const GError *error, gpointer user_data, @@ -730,20 +730,16 @@ event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher, channel, self_handle, &inviter, NULL, NULL)) { /* We are invited to a room */ - EmpathyTpContactFactory *factory; TpConnection *connection; DEBUG ("Have been invited to %s. Ask user if he wants to accept", tp_channel_get_identifier (channel)); connection = empathy_tp_chat_get_connection (tp_chat); - factory = empathy_tp_contact_factory_dup_singleton (connection); - - empathy_tp_contact_factory_get_from_handle (factory, + empathy_tp_contact_factory_get_from_handle (connection, inviter, event_manager_muc_invite_got_contact_cb, approval, NULL, G_OBJECT (manager)); - g_object_unref (factory); return; } @@ -781,17 +777,13 @@ event_manager_approve_channel_cb (EmpathyDispatcher *dispatcher, TpChannel *channel; TpConnection *connection; TpHandle handle; - EmpathyTpContactFactory *factory; channel = empathy_dispatch_operation_get_channel (operation); handle = tp_channel_get_handle (channel, NULL); connection = tp_channel_borrow_connection (channel); - factory = empathy_tp_contact_factory_dup_singleton (connection); - empathy_tp_contact_factory_get_from_handle (factory, handle, + empathy_tp_contact_factory_get_from_handle (connection, handle, event_manager_ft_got_contact_cb, approval, NULL, G_OBJECT (manager)); - - g_object_unref (factory); } else { -- cgit v1.2.3