empathy_tp_chat_is_invited: return a TpContact for the inviter

https://bugzilla.gnome.org/show_bug.cgi?id=675229

2 files changed, 5 insertions, 11 deletions

diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index c70b03087..aa324ca3b 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -1358,11 +1358,10 @@ empathy_tp_chat_leave (EmpathyTpChat *self,
 
 gboolean
 empathy_tp_chat_is_invited (EmpathyTpChat *self,
-    TpHandle *inviter)
+    TpContact **inviter)
 {
-  TpContact *self_contact, *actor;
+  TpContact *self_contact;
   TpChannel *channel = TP_CHANNEL (self);
-  gboolean result;
 
   if (!tp_proxy_has_interface (self, TP_IFACE_CHANNEL_INTERFACE_GROUP))
     return FALSE;
@@ -1371,13 +1370,8 @@ empathy_tp_chat_is_invited (EmpathyTpChat *self,
   if (self_contact == NULL)
     return FALSE;
 
-  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;
+  return tp_channel_group_get_local_pending_contact_info (channel,
+      self_contact, inviter, NULL, NULL);
 }
 
 TpChannelChatState
diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h
index 44f6a240e..d3ad334b3 100644
--- a/libempathy/empathy-tp-chat.h
+++ b/libempathy/empathy-tp-chat.h
@@ -96,7 +96,7 @@ void empathy_tp_chat_leave (EmpathyTpChat *chat,
     const gchar *message);
 
 gboolean empathy_tp_chat_is_invited (EmpathyTpChat *chat,
-    TpHandle *inviter);
+    TpContact **inviter);
 TpChannelChatState empathy_tp_chat_get_chat_state (EmpathyTpChat *chat,
     EmpathyContact *contact);