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-gtk/empathy-group-chat.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-gtk/empathy-group-chat.c')
| -rw-r--r-- | libempathy-gtk/empathy-group-chat.c | 5 |
1 files changed, 3 insertions, 2 deletions
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)); |