diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-04-14 21:01:24 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-04-14 21:01:24 +0800 |
| commit | 150dc07ffeaefc877a3f8c48ba861a93fcb9e6f3 (patch) | |
| tree | 9989ee7c38720b16bc050eacc70584ae07adcc68 /libempathy | |
| parent | 68703c3fc1665588318d717539c8cf965e67b57c (diff) | |
| download | gsoc2013-empathy-150dc07ffeaefc877a3f8c48ba861a93fcb9e6f3.tar gsoc2013-empathy-150dc07ffeaefc877a3f8c48ba861a93fcb9e6f3.tar.gz gsoc2013-empathy-150dc07ffeaefc877a3f8c48ba861a93fcb9e6f3.tar.bz2 gsoc2013-empathy-150dc07ffeaefc877a3f8c48ba861a93fcb9e6f3.tar.lz gsoc2013-empathy-150dc07ffeaefc877a3f8c48ba861a93fcb9e6f3.tar.xz gsoc2013-empathy-150dc07ffeaefc877a3f8c48ba861a93fcb9e6f3.tar.zst gsoc2013-empathy-150dc07ffeaefc877a3f8c48ba861a93fcb9e6f3.zip | |
Various fixes for chats
svn path=/trunk/; revision=938
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 8265339ac..43c760579 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -752,9 +752,6 @@ tp_chat_channel_ready_cb (EmpathyTpChat *chat) priv->id = *names; g_free (names); - priv->ready = TRUE; - g_object_notify (G_OBJECT (chat), "ready"); - if (tp_proxy_has_interface_by_id (priv->channel, TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP)) { priv->group = empathy_tp_group_new (priv->channel); @@ -768,6 +765,7 @@ tp_chat_channel_ready_cb (EmpathyTpChat *chat) g_signal_connect (priv->group, "local-pending", G_CALLBACK (tp_chat_local_pending_cb), chat); + empathy_run_until_ready (priv->group); } else { priv->remote_contact = empathy_contact_factory_get_from_handle (priv->factory, priv->account, @@ -817,6 +815,9 @@ tp_chat_channel_ready_cb (EmpathyTpChat *chat) tp_chat_state_changed_cb, NULL, NULL, G_OBJECT (chat), NULL); + + priv->ready = TRUE; + g_object_notify (G_OBJECT (chat), "ready"); } static void |