diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2007-10-19 17:34:22 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-10-19 17:34:22 +0800 |
| commit | fb7cd00dd189d63114185facb9f161375301ca40 (patch) | |
| tree | 3c2b71a079fb09c6e475126d28c9b6e220c2a9b9 /libempathy/empathy-tp-chatroom.c | |
| parent | 7ff8c4bb2cf473890a854582335da5ddeba78e55 (diff) | |
| download | gsoc2013-empathy-fb7cd00dd189d63114185facb9f161375301ca40.tar gsoc2013-empathy-fb7cd00dd189d63114185facb9f161375301ca40.tar.gz gsoc2013-empathy-fb7cd00dd189d63114185facb9f161375301ca40.tar.bz2 gsoc2013-empathy-fb7cd00dd189d63114185facb9f161375301ca40.tar.lz gsoc2013-empathy-fb7cd00dd189d63114185facb9f161375301ca40.tar.xz gsoc2013-empathy-fb7cd00dd189d63114185facb9f161375301ca40.tar.zst gsoc2013-empathy-fb7cd00dd189d63114185facb9f161375301ca40.zip | |
Don't accept invitation if we are not invited.
2007-10-19 Xavier Claessens <xclaesse@gmail.com>
* 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
Diffstat (limited to 'libempathy/empathy-tp-chatroom.c')
| -rw-r--r-- | libempathy/empathy-tp-chatroom.c | 8 |
1 files changed, 6 insertions, 2 deletions
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) { |