diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-06-19 00:11:58 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-06-19 00:11:58 +0800 |
| commit | bfb75bb92f7e1a4aa93a9e144b781faf03df93eb (patch) | |
| tree | 700eb3afadb8e17d8035a92ee0e30ab018adb495 /libempathy/empathy-tp-chat.c | |
| parent | 13699e023a50f88055f24c0230c28a7163c8356d (diff) | |
| parent | 247ea7a25d8495d2f1cd2b6ac2bf6fe582a3c5fb (diff) | |
| download | gsoc2013-empathy-bfb75bb92f7e1a4aa93a9e144b781faf03df93eb.tar gsoc2013-empathy-bfb75bb92f7e1a4aa93a9e144b781faf03df93eb.tar.gz gsoc2013-empathy-bfb75bb92f7e1a4aa93a9e144b781faf03df93eb.tar.bz2 gsoc2013-empathy-bfb75bb92f7e1a4aa93a9e144b781faf03df93eb.tar.lz gsoc2013-empathy-bfb75bb92f7e1a4aa93a9e144b781faf03df93eb.tar.xz gsoc2013-empathy-bfb75bb92f7e1a4aa93a9e144b781faf03df93eb.tar.zst gsoc2013-empathy-bfb75bb92f7e1a4aa93a9e144b781faf03df93eb.zip | |
Merge branch 'approvers-redone-599158'
Diffstat (limited to 'libempathy/empathy-tp-chat.c')
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 858cfae27..a9a63f548 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -1868,7 +1868,8 @@ empathy_tp_chat_join (EmpathyTpChat *self) } gboolean -empathy_tp_chat_is_invited (EmpathyTpChat *self) +empathy_tp_chat_is_invited (EmpathyTpChat *self, + TpHandle *inviter) { EmpathyTpChatPriv *priv = GET_PRIV (self); TpHandle self_handle; @@ -1881,5 +1882,5 @@ empathy_tp_chat_is_invited (EmpathyTpChat *self) return FALSE; return tp_channel_group_get_local_pending_info (priv->channel, self_handle, - NULL, NULL, NULL); + inviter, NULL, NULL); } |