diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-03 17:02:39 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-03 17:25:19 +0800 |
| commit | a296925676f10385929fee162610d49f1caff373 (patch) | |
| tree | 0e3c292d6588fbfa259cdf772c2744021036e9ca /libempathy | |
| parent | 7faf1b0fef56fd7a22af9ce4216f0eeedfffac26 (diff) | |
| download | gsoc2013-empathy-a296925676f10385929fee162610d49f1caff373.tar gsoc2013-empathy-a296925676f10385929fee162610d49f1caff373.tar.gz gsoc2013-empathy-a296925676f10385929fee162610d49f1caff373.tar.bz2 gsoc2013-empathy-a296925676f10385929fee162610d49f1caff373.tar.lz gsoc2013-empathy-a296925676f10385929fee162610d49f1caff373.tar.xz gsoc2013-empathy-a296925676f10385929fee162610d49f1caff373.tar.zst gsoc2013-empathy-a296925676f10385929fee162610d49f1caff373.zip | |
empathy_tp_chat_is_invited: return a TpContact for the inviter
https://bugzilla.gnome.org/show_bug.cgi?id=675229
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 14 | ||||
| -rw-r--r-- | libempathy/empathy-tp-chat.h | 2 |
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); |