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/empathy-tp-chatroom.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libempathy/empathy-tp-chatroom.c') diff --git a/libempathy/empathy-tp-chatroom.c b/libempathy/empathy-tp-chatroom.c index 60e0dd7cd..13b43ba37 100644 --- a/libempathy/empathy-tp-chatroom.c +++ b/libempathy/empathy-tp-chatroom.c @@ -183,10 +183,10 @@ empathy_tp_chatroom_get_invitation (EmpathyTpChatroom *chatroom, priv = GET_PRIV (chatroom); - if (*contact) { + if (contact) { *contact = priv->invitor; } - if (*message) { + if (message) { *message = priv->invit_message; } @@ -203,6 +203,10 @@ empathy_tp_chatroom_accept_invitation (EmpathyTpChatroom *chatroom) priv = GET_PRIV (chatroom); + if (!priv->is_invited) { + return; + } + /* Clear invitation data */ priv->is_invited = FALSE; if (priv->invitor) { -- cgit v1.2.3