diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2007-05-13 02:04:01 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-05-13 02:04:01 +0800 |
| commit | 321de615c0d7aaecf7f87b31fae65b5b75f0e32e (patch) | |
| tree | 25d012f82bb5b54e5e06a0b51de1722314c67f2a /libempathy/empathy-tp-chat.c | |
| parent | 104362fe34c3881f6956844de2a0403f0ea1b3d0 (diff) | |
| download | gsoc2013-empathy-321de615c0d7aaecf7f87b31fae65b5b75f0e32e.tar gsoc2013-empathy-321de615c0d7aaecf7f87b31fae65b5b75f0e32e.tar.gz gsoc2013-empathy-321de615c0d7aaecf7f87b31fae65b5b75f0e32e.tar.bz2 gsoc2013-empathy-321de615c0d7aaecf7f87b31fae65b5b75f0e32e.tar.lz gsoc2013-empathy-321de615c0d7aaecf7f87b31fae65b5b75f0e32e.tar.xz gsoc2013-empathy-321de615c0d7aaecf7f87b31fae65b5b75f0e32e.tar.zst gsoc2013-empathy-321de615c0d7aaecf7f87b31fae65b5b75f0e32e.zip | |
[darcs-to-svn @ gossip_mission_control_new() returns a MissionControl sigleton object and update throbber state when there is connecting accounts]
svn path=/trunk/; revision=47
Diffstat (limited to 'libempathy/empathy-tp-chat.c')
| -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 4729cc267..2e5444fb1 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -22,10 +22,10 @@ #include <config.h> -#include <libtelepathy/tp-helpers.h> #include <libtelepathy/tp-chan-type-text-gen.h> #include <libtelepathy/tp-chan-iface-chat-state-gen.h> #include <libtelepathy/tp-conn.h> +#include <libtelepathy/tp-helpers.h> #include "empathy-tp-chat.h" #include "empathy-contact-manager.h" @@ -33,6 +33,7 @@ #include "empathy-marshal.h" #include "gossip-debug.h" #include "gossip-time.h" +#include "gossip-utils.h" #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ EMPATHY_TYPE_TP_CHAT, EmpathyTpChatPriv)) @@ -198,7 +199,7 @@ empathy_tp_chat_new (McAccount *account, priv->list = empathy_contact_manager_get_list (priv->manager, account); priv->tp_chan = g_object_ref (tp_chan); priv->account = g_object_ref (account); - priv->mc = mission_control_new (tp_get_bus ()); + priv->mc = gossip_mission_control_new (); g_object_ref (priv->list); priv->text_iface = tp_chan_get_interface (tp_chan, @@ -242,7 +243,7 @@ empathy_tp_chat_new_with_contact (GossipContact *contact) g_return_val_if_fail (GOSSIP_IS_CONTACT (contact), NULL); - mc = mission_control_new (tp_get_bus ()); + mc = gossip_mission_control_new (); account = gossip_contact_get_account (contact); if (mission_control_get_connection_status (mc, account, NULL) != 0) { |