From fb7cd00dd189d63114185facb9f161375301ca40 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 19 Oct 2007 09:34:22 +0000 Subject: Don't accept invitation if we are not invited. 2007-10-19 Xavier Claessens * libempathy-gtk/empathy-group-chat.c: * libempathy/empathy-tp-chatroom.c:Don't accept invitation if we are not invited. * libempathy-gtk/empathy-status-icon.c: Correctly toggle visibility with ALT-F4 on the main windows. svn path=/trunk/; revision=378 --- libempathy-gtk/empathy-group-chat.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libempathy-gtk/empathy-group-chat.c') diff --git a/libempathy-gtk/empathy-group-chat.c b/libempathy-gtk/empathy-group-chat.c index f3c8e8a20..778c08f1d 100644 --- a/libempathy-gtk/empathy-group-chat.c +++ b/libempathy-gtk/empathy-group-chat.c @@ -523,8 +523,9 @@ group_chat_set_tp_chat (EmpathyChat *chat, priv->tp_chat = g_object_ref (tp_chat); - /* FIXME: Ask the user before accepting */ - empathy_tp_chatroom_accept_invitation (priv->tp_chat); + if (empathy_tp_chatroom_get_invitation (priv->tp_chat, NULL, NULL)) { + empathy_tp_chatroom_accept_invitation (priv->tp_chat); + } /* Create contact list */ priv->store = empathy_contact_list_store_new (EMPATHY_CONTACT_LIST (priv->tp_chat)); -- cgit v1.2.3