diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-05-19 17:16:22 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-06-17 20:53:23 +0800 |
| commit | 8c8046a95a4db39a507aceb78e3c23f959eb7745 (patch) | |
| tree | 08de4fb16840ffdf41ea8fecc6f1791e8fadbaa2 | |
| parent | 14d38669faa5ed366832dd8f8fc9da7813f8a4af (diff) | |
| download | gsoc2013-empathy-8c8046a95a4db39a507aceb78e3c23f959eb7745.tar gsoc2013-empathy-8c8046a95a4db39a507aceb78e3c23f959eb7745.tar.gz gsoc2013-empathy-8c8046a95a4db39a507aceb78e3c23f959eb7745.tar.bz2 gsoc2013-empathy-8c8046a95a4db39a507aceb78e3c23f959eb7745.tar.lz gsoc2013-empathy-8c8046a95a4db39a507aceb78e3c23f959eb7745.tar.xz gsoc2013-empathy-8c8046a95a4db39a507aceb78e3c23f959eb7745.tar.zst gsoc2013-empathy-8c8046a95a4db39a507aceb78e3c23f959eb7745.zip | |
add inviter arg to empathy_tp_chat_is_invited
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 5 | ||||
| -rw-r--r-- | libempathy/empathy-tp-chat.h | 3 | ||||
| -rw-r--r-- | src/empathy.c | 2 |
3 files changed, 6 insertions, 4 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); } diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h index e5abe936f..3ac5eaf58 100644 --- a/libempathy/empathy-tp-chat.h +++ b/libempathy/empathy-tp-chat.h @@ -101,7 +101,8 @@ gboolean empathy_tp_chat_can_add_contact (EmpathyTpChat *self); void empathy_tp_chat_leave (EmpathyTpChat *chat); void empathy_tp_chat_join (EmpathyTpChat *chat); -gboolean empathy_tp_chat_is_invited (EmpathyTpChat *chat); +gboolean empathy_tp_chat_is_invited (EmpathyTpChat *chat, + TpHandle *inviter); G_END_DECLS diff --git a/src/empathy.c b/src/empathy.c index 9d59bba79..5f3131389 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -136,7 +136,7 @@ dispatch_cb (EmpathyDispatcher *dispatcher, empathy_chat_window_present_chat (chat, empathy_dispatch_operation_get_user_action_time (operation)); - if (empathy_tp_chat_is_invited (tp_chat)) + if (empathy_tp_chat_is_invited (tp_chat, NULL)) { /* We have been invited to the room. Add ourself as member as this * channel has been approved. */ |