[empathy: 3/9] add inviter arg to empathy_tp_chat_is_invited
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 3/9] add inviter arg to empathy_tp_chat_is_invited
- Date: Fri, 18 Jun 2010 16:12:28 +0000 (UTC)
commit 8c8046a95a4db39a507aceb78e3c23f959eb7745
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed May 19 11:16:22 2010 +0200
add inviter arg to empathy_tp_chat_is_invited
libempathy/empathy-tp-chat.c | 5 +++--
libempathy/empathy-tp-chat.h | 3 ++-
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 858cfae..a9a63f5 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 e5abe93..3ac5eaf 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 9d59bba..5f31313 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. */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]