diff options
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)); |