[empathy: 10/17] Replace raw Tp call with existing abstraction in EmpathyTpChat
- From: Danielle Madeley <davyd src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy: 10/17] Replace raw Tp call with existing abstraction in EmpathyTpChat
- Date: Tue, 22 Dec 2009 10:57:34 +0000 (UTC)
commit 79074c4ba575f4b01782f6f498a3e9f91cd7ba21
Author: Danielle Madeley <danielle madeley collabora co uk>
Date: Mon Dec 21 10:21:11 2009 +1100
Replace raw Tp call with existing abstraction in EmpathyTpChat
src/empathy-chat-window.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 240dc4b..5e0ad04 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -43,6 +43,7 @@
#include <libempathy/empathy-chatroom-manager.h>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-tp-contact-factory.h>
+#include <libempathy/empathy-contact-list.h>
#include <libempathy-gtk/empathy-images.h>
#include <libempathy-gtk/empathy-conf.h>
@@ -873,7 +874,7 @@ got_contact_cb (EmpathyTpContactFactory *factory,
gpointer user_data,
GObject *object)
{
- TpChannel *channel = TP_CHANNEL (user_data);
+ EmpathyTpChat *tp_chat = EMPATHY_TP_CHAT (user_data);
if (error != NULL)
{
@@ -882,13 +883,8 @@ got_contact_cb (EmpathyTpContactFactory *factory,
}
else
{
- TpHandle handle = empathy_contact_get_handle (contact);
- GArray handles = {(gchar *) &handle, 1};
-
- tp_cli_channel_interface_group_call_add_members (
- channel, -1, &handles,
- _("Inviting to this room"),
- NULL, NULL, NULL, NULL);
+ empathy_contact_list_add (EMPATHY_CONTACT_LIST (tp_chat),
+ contact, _("Inviting you to this room"));
}
}
@@ -941,7 +937,7 @@ chat_window_invite_participant_activate_cb (GtkAction *action,
factory = empathy_tp_contact_factory_dup_singleton (connection);
empathy_tp_contact_factory_get_from_id (factory, id,
- got_contact_cb, channel, NULL, NULL);
+ got_contact_cb, tp_chat, NULL, NULL);
g_object_unref (factory);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]