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 /src | |
| 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 'src')
| -rw-r--r-- | src/empathy-chat-main.c | 4 | ||||
| -rw-r--r-- | src/empathy-main.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/empathy-chat-main.c b/src/empathy-chat-main.c index 9b961d554..2826e4b52 100644 --- a/src/empathy-chat-main.c +++ b/src/empathy-chat-main.c @@ -29,11 +29,11 @@ #include <libtelepathy/tp-conn.h> #include <libtelepathy/tp-chan.h> -#include <libtelepathy/tp-helpers.h> #include <libmissioncontrol/mc-account.h> #include <libempathy/gossip-contact.h> #include <libempathy/gossip-debug.h> +#include <libempathy/gossip-utils.h> #include <libempathy/empathy-chandler.h> #include <libempathy/empathy-contact-manager.h> #include <libempathy/empathy-contact-list.h> @@ -110,7 +110,7 @@ new_channel_cb (EmpathyChandler *chandler, GossipPrivateChat *chat; /* We have a private chat channel */ - mc = mission_control_new (tp_get_bus ()); + mc = gossip_mission_control_new (); account = mission_control_get_account_for_connection (mc, tp_conn, NULL); manager = empathy_contact_manager_new (); list = empathy_contact_manager_get_list (manager, account); diff --git a/src/empathy-main.c b/src/empathy-main.c index 6780ff680..c632fa696 100644 --- a/src/empathy-main.c +++ b/src/empathy-main.c @@ -27,13 +27,12 @@ #include <glib.h> #include <gtk/gtk.h> -#include <libtelepathy/tp-helpers.h> - #include <libmissioncontrol/mc-account.h> #include <libmissioncontrol/mc-account-monitor.h> #include <libmissioncontrol/mission-control.h> #include <libempathy/gossip-debug.h> +#include <libempathy/gossip-utils.h> #include <libempathy/gossip-presence.h> #include <libempathy-gtk/empathy-main-window.h> #include <libempathy-gtk/empathy-status-icon.h> @@ -144,7 +143,7 @@ main (int argc, char *argv[]) /* Setting up MC */ monitor = mc_account_monitor_new (); - mc = mission_control_new (tp_get_bus ()); + mc = gossip_mission_control_new (); g_signal_connect (monitor, "account-enabled", G_CALLBACK (account_enabled_cb), mc); |