aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-tp-chat.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-05-02 17:28:43 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-05-03 16:53:34 +0800
commit73b1e75262d87d78602b6c8cc6c9bec8aa875f0b (patch)
tree1ebba00cc47ec0555c2a97b65431e9aad28758a9 /libempathy/empathy-tp-chat.c
parentf6cca8274e3cce4821d93b9bbdb456a864a7b7dc (diff)
downloadgsoc2013-empathy-73b1e75262d87d78602b6c8cc6c9bec8aa875f0b.tar
gsoc2013-empathy-73b1e75262d87d78602b6c8cc6c9bec8aa875f0b.tar.gz
gsoc2013-empathy-73b1e75262d87d78602b6c8cc6c9bec8aa875f0b.tar.bz2
gsoc2013-empathy-73b1e75262d87d78602b6c8cc6c9bec8aa875f0b.tar.lz
gsoc2013-empathy-73b1e75262d87d78602b6c8cc6c9bec8aa875f0b.tar.xz
gsoc2013-empathy-73b1e75262d87d78602b6c8cc6c9bec8aa875f0b.tar.zst
gsoc2013-empathy-73b1e75262d87d78602b6c8cc6c9bec8aa875f0b.zip
empathy_tp_chat_is_invited: use new channel group API
https://bugzilla.gnome.org/show_bug.cgi?id=675229
Diffstat (limited to 'libempathy/empathy-tp-chat.c')
-rw-r--r--libempathy/empathy-tp-chat.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 9d8698096..f66fe2d7c 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -1462,17 +1462,24 @@ gboolean
empathy_tp_chat_is_invited (EmpathyTpChat *self,
TpHandle *inviter)
{
- TpHandle self_handle;
+ TpContact *self_contact, *actor;
+ TpChannel *channel = TP_CHANNEL (self);
+ gboolean result;
if (!tp_proxy_has_interface (self, TP_IFACE_CHANNEL_INTERFACE_GROUP))
return FALSE;
- self_handle = tp_channel_group_get_self_handle ((TpChannel *) self);
- if (self_handle == 0)
+ self_contact = tp_channel_group_get_self_contact (channel);
+ if (self_contact == NULL)
return FALSE;
- return tp_channel_group_get_local_pending_info ((TpChannel *) self,
- self_handle, inviter, NULL, NULL);
+ result = tp_channel_group_get_local_pending_contact_info (channel,
+ self_contact, &actor, NULL, NULL);
+
+ if (inviter != NULL)
+ *inviter = tp_contact_get_handle (actor);
+
+ return result;
}
TpChannelChatState