[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

12 files changed, 160 insertions, 175 deletions

diff --git a/libempathy-gtk/empathy-main-window.c b/libempathy-gtk/empathy-main-window.c
index f19a86886..dcee74081 100644
--- a/libempathy-gtk/empathy-main-window.c
+++ b/libempathy-gtk/empathy-main-window.c
@@ -27,8 +27,6 @@
 #include <glade/glade.h>
 #include <glib/gi18n.h>
 
-#include <libtelepathy/tp-helpers.h>
-
 #include <libempathy/gossip-conf.h>
 #include <libempathy/gossip-contact.h>
 #include <libempathy/gossip-debug.h>
@@ -57,6 +55,7 @@
 
 typedef struct {
 	GossipContactList *contact_list;
+	MissionControl    *mc;
 
 	/* Main widgets */
 	GtkWidget         *window;
@@ -76,9 +75,9 @@ typedef struct {
 	/* Throbber */
 	GtkWidget         *throbber;
 
-	/* Widgets that are enabled when we're connected/disconnected */
-	GList             *widgets_connected;
-	GList             *widgets_disconnected;
+	/* Widgets that are enabled when there is... */
+	GList             *widgets_connected;		/* ... connected accounts */
+	GList             *widgets_disconnected;	/* ... disconnected accounts */
 
 	/* Status popup */
 	GtkWidget         *presence_toolbar;
@@ -88,61 +87,68 @@ typedef struct {
 	guint              size_timeout_id;
 } EmpathyMainWindow;
 
-static void     main_window_destroy_cb                     (GtkWidget           *widget,
-							    EmpathyMainWindow   *window);
+static void     main_window_destroy_cb                     (GtkWidget                       *widget,
+							    EmpathyMainWindow               *window);
 static void     main_window_favorite_chatroom_menu_setup   (void);
-static void     main_window_chat_quit_cb                   (GtkWidget           *widget,
-							    EmpathyMainWindow   *window);
-static void     main_window_chat_new_message_cb            (GtkWidget           *widget,
-							    EmpathyMainWindow   *window);
-static void     main_window_chat_history_cb                (GtkWidget           *widget,
-							    EmpathyMainWindow   *window);
-static void     main_window_room_join_new_cb               (GtkWidget           *widget,
-							    EmpathyMainWindow   *window);
-static void     main_window_room_join_favorites_cb         (GtkWidget           *widget,
-							    EmpathyMainWindow   *window);
-static void     main_window_room_manage_favorites_cb       (GtkWidget           *widget,
-							    EmpathyMainWindow   *window);
-static void     main_window_chat_add_contact_cb            (GtkWidget           *widget,
-							    EmpathyMainWindow   *window);
-static void     main_window_chat_show_offline_cb           (GtkCheckMenuItem    *item,
-							    EmpathyMainWindow   *window);
-static gboolean main_window_edit_button_press_event_cb     (GtkWidget           *widget,
-							    GdkEventButton      *event,
-							    EmpathyMainWindow   *window);
-static void     main_window_edit_accounts_cb               (GtkWidget           *widget,
-							    EmpathyMainWindow   *window);
-static void     main_window_edit_personal_information_cb   (GtkWidget           *widget,
-							    EmpathyMainWindow   *window);
-static void     main_window_edit_preferences_cb            (GtkWidget           *widget,
-							    EmpathyMainWindow   *window);
-static void     main_window_help_about_cb                  (GtkWidget           *widget,
-							    EmpathyMainWindow   *window);
-static void     main_window_help_contents_cb               (GtkWidget           *widget,
-							    EmpathyMainWindow   *window);
-static gboolean main_window_throbber_button_press_event_cb (GtkWidget           *throbber_ebox,
-							    GdkEventButton      *event,
-							    gpointer             user_data);
+static void     main_window_chat_quit_cb                   (GtkWidget                       *widget,
+							    EmpathyMainWindow               *window);
+static void     main_window_chat_new_message_cb            (GtkWidget                       *widget,
+							    EmpathyMainWindow               *window);
+static void     main_window_chat_history_cb                (GtkWidget                       *widget,
+							    EmpathyMainWindow               *window);
+static void     main_window_room_join_new_cb               (GtkWidget                       *widget,
+							    EmpathyMainWindow               *window);
+static void     main_window_room_join_favorites_cb         (GtkWidget                       *widget,
+							    EmpathyMainWindow               *window);
+static void     main_window_room_manage_favorites_cb       (GtkWidget                       *widget,
+							    EmpathyMainWindow               *window);
+static void     main_window_chat_add_contact_cb            (GtkWidget                       *widget,
+							    EmpathyMainWindow               *window);
+static void     main_window_chat_show_offline_cb           (GtkCheckMenuItem                *item,
+							    EmpathyMainWindow               *window);
+static gboolean main_window_edit_button_press_event_cb     (GtkWidget                       *widget,
+							    GdkEventButton                  *event,
+							    EmpathyMainWindow               *window);
+static void     main_window_edit_accounts_cb               (GtkWidget                       *widget,
+							    EmpathyMainWindow               *window);
+static void     main_window_edit_personal_information_cb   (GtkWidget                       *widget,
+							    EmpathyMainWindow               *window);
+static void     main_window_edit_preferences_cb            (GtkWidget                       *widget,
+							    EmpathyMainWindow               *window);
+static void     main_window_help_about_cb                  (GtkWidget                       *widget,
+							    EmpathyMainWindow               *window);
+static void     main_window_help_contents_cb               (GtkWidget                       *widget,
+							    EmpathyMainWindow               *window);
+static gboolean main_window_throbber_button_press_event_cb (GtkWidget                       *throbber_ebox,
+							    GdkEventButton                  *event,
+							    gpointer                         user_data);
+static void     main_window_status_changed_cb              (MissionControl                  *mc,
+							    TelepathyConnectionStatus        status,
+							    McPresence                       presence,
+							    TelepathyConnectionStatusReason  reason,
+							    const gchar                     *unique_name,
+							    EmpathyMainWindow               *window);
+static void     main_window_update_status                  (EmpathyMainWindow               *window);
 static void     main_window_accels_load                    (void);
 static void     main_window_accels_save                    (void);
-static void     main_window_connection_items_setup         (EmpathyMainWindow   *window,
-							    GladeXML            *glade);
-static gboolean main_window_configure_event_timeout_cb     (EmpathyMainWindow   *window);
-static gboolean main_window_configure_event_cb             (GtkWidget           *widget,
-							    GdkEventConfigure   *event,
-							    EmpathyMainWindow   *window);
-static void     main_window_notify_show_offline_cb         (GossipConf          *conf,
-							    const gchar         *key,
-							    gpointer             check_menu_item);
-static void     main_window_notify_show_avatars_cb         (GossipConf          *conf,
-							    const gchar         *key,
-							    EmpathyMainWindow   *window);
-static void     main_window_notify_compact_contact_list_cb (GossipConf          *conf,
-							    const gchar         *key,
-							    EmpathyMainWindow   *window);
-static void     main_window_notify_sort_criterium_cb       (GossipConf          *conf,
-							    const gchar         *key,
-							    EmpathyMainWindow   *window);
+static void     main_window_connection_items_setup         (EmpathyMainWindow               *window,
+							    GladeXML                        *glade);
+static gboolean main_window_configure_event_timeout_cb     (EmpathyMainWindow               *window);
+static gboolean main_window_configure_event_cb             (GtkWidget                       *widget,
+							    GdkEventConfigure               *event,
+							    EmpathyMainWindow               *window);
+static void     main_window_notify_show_offline_cb         (GossipConf                      *conf,
+							    const gchar                     *key,
+							    gpointer                         check_menu_item);
+static void     main_window_notify_show_avatars_cb         (GossipConf                      *conf,
+							    const gchar                     *key,
+							    EmpathyMainWindow               *window);
+static void     main_window_notify_compact_contact_list_cb (GossipConf                      *conf,
+							    const gchar                     *key,
+							    EmpathyMainWindow               *window);
+static void     main_window_notify_sort_criterium_cb       (GossipConf                      *conf,
+							    const gchar                     *key,
+							    EmpathyMainWindow               *window);
 
 GtkWidget *
 empathy_main_window_show (void)
@@ -208,6 +214,10 @@ empathy_main_window_show (void)
 	g_object_unref (glade);
 
 	window->tooltips = g_object_ref_sink (gtk_tooltips_new ());
+	window->mc = gossip_mission_control_new ();
+	dbus_g_proxy_connect_signal (DBUS_G_PROXY (window->mc), "AccountStatusChanged",
+				     G_CALLBACK (main_window_status_changed_cb),
+				     window, NULL);
 
 	/* Set up menu */
 	main_window_favorite_chatroom_menu_setup ();
@@ -225,9 +235,6 @@ empathy_main_window_show (void)
 	gtk_tool_item_set_expand (item, TRUE);
 	gtk_toolbar_insert (GTK_TOOLBAR (window->presence_toolbar), item, -1);
 
-	window->widgets_connected = g_list_prepend (window->widgets_connected,
-						    window->presence_chooser);
-
 	/* Set up the throbber */
 	ebox = gtk_event_box_new ();
 	gtk_event_box_set_visible_window (GTK_EVENT_BOX (ebox), FALSE);
@@ -323,6 +330,7 @@ empathy_main_window_show (void)
 					      GOSSIP_PREFS_CONTACTS_SORT_CRITERIUM,
 					      window);
 
+	main_window_update_status (window);
 	gtk_widget_show (window->window);
 
 	return window->window;
@@ -335,6 +343,10 @@ main_window_destroy_cb (GtkWidget         *widget,
 	/* Save user-defined accelerators. */
 	main_window_accels_save ();
 
+	dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (window->mc), "AccountStatusChanged",
+					G_CALLBACK (main_window_status_changed_cb),
+					window);
+
 	if (window->size_timeout_id) {
 		g_source_remove (window->size_timeout_id);
 	}
@@ -343,6 +355,7 @@ main_window_destroy_cb (GtkWidget         *widget,
 	g_list_free (window->widgets_disconnected);
 
 	g_object_unref (window->tooltips);
+	g_object_unref (window->mc);
 
 	g_free (window);
 }
@@ -530,109 +543,67 @@ main_window_throbber_button_press_event_cb (GtkWidget      *throbber_ebox,
 	return FALSE;
 }
 
-#if 0
 static void
-main_window_session_protocol_connecting_cb (GossipSession  *session,
-				    GossipAccount  *account,
-				    GossipProtocol *protocol,
-				    gpointer        user_data)
+main_window_status_changed_cb (MissionControl                  *mc,
+			       TelepathyConnectionStatus        status,
+			       McPresence                       presence,
+			       TelepathyConnectionStatusReason  reason,
+			       const gchar                     *unique_name,
+			       EmpathyMainWindow               *window)
 {
-	GossipAppPriv *priv;
-	const gchar   *name;
-
-	priv = GET_PRIV (app);
-
-	name = gossip_account_get_name (account);
-	gossip_debug (DEBUG_DOMAIN, "Connecting account:'%s'", name);
-
-	ephy_spinner_start (EPHY_SPINNER (window->throbber));
+	main_window_update_status (window);
 }
 
 static void
-main_window_session_protocol_connected_cb (GossipSession  *session,
-				   GossipAccount  *account,
-				   GossipProtocol *protocol,
-				   gpointer        user_data)
+main_window_update_status (EmpathyMainWindow *window)
 {
-	GossipAppPriv *priv;
-	gboolean       connecting;
-	const gchar   *name;
-
-	priv = GET_PRIV (app);
-
-	name = gossip_account_get_name (account);
-	gossip_debug (DEBUG_DOMAIN, "Connected account:'%s'", name);
-
-	gossip_session_count_accounts (window->session,
-				       NULL,
-				       &connecting,
-				       NULL);
+	GList *accounts, *l;
+	guint  connected = 0;
+	guint  connecting = 0;
+	guint  disconnected = 0;
+
+	/* Count number of connected/connecting/disconnected accounts */
+	accounts = mc_accounts_list ();	
+	for (l = accounts; l; l = l->next) {
+		McAccount *account;
+		guint      status;
+
+		account = l->data;
+
+		status = mission_control_get_connection_status (window->mc,
+								account,
+								NULL);
+
+		if (status == 0) {
+			connected++;
+		} else if (status == 1) {
+			connecting++;
+		} else if (status == 2) {
+			disconnected++;
+		}
 
-	if (connecting < 1) {
-		ephy_spinner_stop (EPHY_SPINNER (window->throbber));
+		g_object_unref (account);
 	}
+	g_list_free (accounts);
 
-	g_hash_table_remove (window->errors, account);
-	g_hash_table_remove (window->reconnects, account);
-
-	app_connection_items_update ();
-	app_favorite_chatroom_menu_update ();
-
-	/* Use saved presence */
-	gossip_app_set_presence (gossip_status_presets_get_default_state (),
-				 gossip_status_presets_get_default_status());
-
-	app_presence_updated ();
-}
-
-static void
-main_window_session_protocol_disconnected_cb (GossipSession  *session,
-				      GossipAccount  *account,
-				      GossipProtocol *protocol,
-				      gint            reason,
-				      gpointer        user_data)
-{
-	GossipAppPriv *priv;
-	gboolean       connecting;
-	gboolean       should_reconnect;
-	const gchar   *name;
-
-	priv = GET_PRIV (app);
-
-	name = gossip_account_get_name (account);
-	gossip_debug (DEBUG_DOMAIN, "Disconnected account:'%s'", name);
-
-	gossip_session_count_accounts (window->session,
-				       NULL,
-				       &connecting,
-				       NULL);
-
-	if (connecting < 1) {
+	/* Update the spinner state */
+	if (connecting > 0) {
+		ephy_spinner_start (EPHY_SPINNER (window->throbber));
+	} else {
 		ephy_spinner_stop (EPHY_SPINNER (window->throbber));
 	}
 
-	app_connection_items_update ();
-	app_favorite_chatroom_menu_update ();
-	app_presence_updated ();
-
-	should_reconnect = reason != GOSSIP_PROTOCOL_DISCONNECT_ASKED;
-
-
-	should_reconnect &= !g_hash_table_lookup (window->reconnects, account);
-
-	if (should_reconnect) {
-		guint id;
+	/* Update widgets sensibility */
+	for (l = window->widgets_connected; l; l = l->next) {
+		gtk_widget_set_sensitive (l->data, (connected > 0));
+	}
 
-		/* Unexpected disconnection, try to reconnect */
-		id = g_timeout_add (RETRY_CONNECT_TIMEOUT * 1000,
-				    (GSourceFunc) app_reconnect_cb,
-				    account);
-		g_hash_table_insert (window->reconnects,
-				     g_object_ref (account),
-				     &id);
+	for (l = window->widgets_disconnected; l; l = l->next) {
+		gtk_widget_set_sensitive (l->data, (disconnected > 0));
 	}
+
+	//app_favorite_chatroom_menu_update ();	
 }
-#endif
 
 /*
  * Accels
@@ -676,14 +647,12 @@ main_window_connection_items_setup (EmpathyMainWindow *window,
 	GtkWidget     *w;
 	gint           i;
 	const gchar *widgets_connected[] = {
-		"chat_disconnect",
 		"room",
 		"chat_new_message",
 		"chat_add_contact",
 		"edit_personal_information"
 	};
 	const gchar *widgets_disconnected[] = {
-		"chat_connect"
 	};
 
 	for (i = 0, list = NULL; i < G_N_ELEMENTS (widgets_connected); i++) {
diff --git a/libempathy-gtk/empathy-status-icon.c b/libempathy-gtk/empathy-status-icon.c
index e22156a00..0aa0a76a5 100644
--- a/libempathy-gtk/empathy-status-icon.c
+++ b/libempathy-gtk/empathy-status-icon.c
@@ -28,8 +28,6 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
-#include <libtelepathy/tp-helpers.h>
-
 #include <libmissioncontrol/mission-control.h>
 
 #include <libempathy/gossip-debug.h>
@@ -102,7 +100,7 @@ empathy_status_icon_init (EmpathyStatusIcon *icon)
 	priv = GET_PRIV (icon);
 
 	priv->icon = gtk_status_icon_new ();
-	priv->mc = mission_control_new (tp_get_bus ());
+	priv->mc = gossip_mission_control_new ();
 
 	status_icon_create_menu (icon);
 
@@ -182,10 +180,8 @@ status_icon_presence_changed_cb (MissionControl    *mc,
 	g_free (status);
 
 	if (state < MC_PRESENCE_AVAILABLE) {
-		gtk_widget_set_sensitive (priv->status_item, FALSE);
 		gtk_widget_set_sensitive (priv->message_item, FALSE);
 	} else {
-		gtk_widget_set_sensitive (priv->status_item, TRUE);
 		gtk_widget_set_sensitive (priv->message_item, TRUE);
 	}
 }
diff --git a/libempathy-gtk/gossip-accounts-dialog.c b/libempathy-gtk/gossip-accounts-dialog.c
index 5155ced12..6d7934544 100644
--- a/libempathy-gtk/gossip-accounts-dialog.c
+++ b/libempathy-gtk/gossip-accounts-dialog.c
@@ -37,7 +37,6 @@
 #include <libmissioncontrol/mission-control.h>
 #include <libmissioncontrol/mc-account-monitor.h>
 #include <libtelepathy/tp-constants.h>
-#include <libtelepathy/tp-helpers.h>
 
 #include <libempathy/gossip-debug.h>
 #include <libempathy/gossip-paths.h>
@@ -676,6 +675,10 @@ accounts_dialog_status_changed_cb (MissionControl                  *mc,
 	model = gtk_tree_view_get_model (view);
 	account = mc_account_lookup (unique_name);
 
+	gossip_debug (DEBUG_DOMAIN, "Status changed for account %s: "
+		      "status=%d presence=%d",
+		      unique_name, status, presence);
+
 	for (ok = gtk_tree_model_get_iter_first (model, &iter);
 	     ok;
 	     ok = gtk_tree_model_iter_next (model, &iter)) {
@@ -1005,7 +1008,7 @@ gossip_accounts_dialog_show (void)
 	gtk_widget_show (dialog->combobox_profile);
 
 	/* Set up signalling */
-	dialog->mc = mission_control_new (tp_get_bus ());
+	dialog->mc = gossip_mission_control_new ();
 	dialog->monitor = mc_account_monitor_new ();
 
 	/* FIXME: connect account-enabled/disabled too */
diff --git a/libempathy-gtk/gossip-contact-list.c b/libempathy-gtk/gossip-contact-list.c
index 86ae9656b..e268e419f 100644
--- a/libempathy-gtk/gossip-contact-list.c
+++ b/libempathy-gtk/gossip-contact-list.c
@@ -29,13 +29,12 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
-#include <libtelepathy/tp-helpers.h>
-
 #include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mission-control.h>
 
 #include <libempathy/empathy-contact-manager.h>
 #include <libempathy/gossip-debug.h>
+#include <libempathy/gossip-utils.h>
 
 #include "empathy-images.h"
 #include "gossip-contact-list.h"
@@ -2543,7 +2542,7 @@ contact_list_action_activated (GossipContactList *list,
 {
 	MissionControl *mc;
 
-	mc = mission_control_new (tp_get_bus ());
+	mc = gossip_mission_control_new ();
 	mission_control_request_channel (mc,
 					 gossip_contact_get_account (contact),
 					 TP_IFACE_CHANNEL_TYPE_TEXT,
diff --git a/libempathy-gtk/gossip-presence-chooser.c b/libempathy-gtk/gossip-presence-chooser.c
index 556bcf137..e92de9efa 100644
--- a/libempathy-gtk/gossip-presence-chooser.c
+++ b/libempathy-gtk/gossip-presence-chooser.c
@@ -30,7 +30,6 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
-#include <libtelepathy/tp-helpers.h>
 #include <libmissioncontrol/mission-control.h>
 
 #include <libempathy/gossip-utils.h>
@@ -202,7 +201,7 @@ gossip_presence_chooser_init (GossipPresenceChooser *chooser)
 			  G_CALLBACK (presence_chooser_scroll_event_cb),
 			  NULL);
 
-	priv->mc = mission_control_new (tp_get_bus ());
+	priv->mc = gossip_mission_control_new ();
 	state = mission_control_get_presence_actual (priv->mc, NULL);
 	presence_chooser_presence_changed_cb (priv->mc, state, chooser);
 	dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc),
@@ -869,7 +868,7 @@ presence_chooser_set_state (McPresence   state,
 	gossip_debug (DEBUG_DOMAIN, "Setting presence to %s (%d)",
 		      status, state);
 
-	mc = mission_control_new (tp_get_bus ());
+	mc = gossip_mission_control_new ();
 	mission_control_set_presence (mc, state, status, NULL, NULL);
 	g_object_unref (mc);
 }
diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c
index f1cede9eb..6966ba23f 100644
--- a/libempathy/empathy-contact-list.c
+++ b/libempathy/empathy-contact-list.c
@@ -25,9 +25,9 @@
 
 #include <string.h>
 
+#include <libtelepathy/tp-helpers.h>
 #include <libtelepathy/tp-conn.h>
 #include <libtelepathy/tp-chan.h>
-#include <libtelepathy/tp-helpers.h>
 #include <libtelepathy/tp-chan-type-contact-list-gen.h>
 #include <libtelepathy/tp-conn-iface-aliasing-gen.h>
 #include <libtelepathy/tp-conn-iface-presence-gen.h>
@@ -324,7 +324,7 @@ empathy_contact_list_new (McAccount *account)
 
 	g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
 
-	mc = mission_control_new (tp_get_bus ());
+	mc = gossip_mission_control_new ();
 
 	if (mission_control_get_connection_status (mc, account, NULL) != 0) {
 		/* The account is not connected, nothing to do. */
diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index 50ed576b5..ebc6b0573 100644
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -24,7 +24,6 @@
 
 #include <string.h>
 
-#include <libtelepathy/tp-helpers.h>
 #include <libtelepathy/tp-constants.h>
 
 #include "empathy-contact-manager.h"
@@ -140,7 +139,7 @@ empathy_contact_manager_init (EmpathyContactManager *manager)
 					     (GDestroyNotify) g_object_unref,
 					     (GDestroyNotify) g_object_unref);
 
-	priv->mc = mission_control_new (tp_get_bus ());
+	priv->mc = gossip_mission_control_new ();
 
 	dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc),
 				     "AccountStatusChanged",
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) {
diff --git a/libempathy/gossip-utils.c b/libempathy/gossip-utils.c
index 668898712..b8cc59ab7 100644
--- a/libempathy/gossip-utils.c
+++ b/libempathy/gossip-utils.c
@@ -34,6 +34,7 @@
 
 #include <libxml/uri.h>
 #include <libmissioncontrol/mc-account.h>
+#include <libtelepathy/tp-helpers.h>
 
 #include "gossip-debug.h"
 #include "gossip-utils.h"
@@ -448,3 +449,18 @@ gossip_get_own_contact_from_contact (GossipContact  *contact)
 	return own_contact;
 }
 
+MissionControl *
+gossip_mission_control_new (void)
+{
+	static MissionControl *mc = NULL;
+
+	if (!mc) {
+		mc = mission_control_new (tp_get_bus ());
+		g_object_add_weak_pointer (G_OBJECT (mc), (gpointer) &mc);
+	} else {
+		g_object_ref (mc);
+	}
+
+	return mc;
+}
+
diff --git a/libempathy/gossip-utils.h b/libempathy/gossip-utils.h
index ee093fe65..e1e9baeed 100644
--- a/libempathy/gossip-utils.h
+++ b/libempathy/gossip-utils.h
@@ -32,6 +32,8 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
+#include <libmissioncontrol/mission-control.h>
+
 #include "gossip-contact.h"
 
 G_BEGIN_DECLS
@@ -87,6 +89,8 @@ guint        gossip_account_hash                    (gconstpointer   key);
 gboolean     gossip_account_equal                   (gconstpointer   a,
 						     gconstpointer   b);
 GossipContact * gossip_get_own_contact_from_contact (GossipContact  *contact);
+MissionControl *gossip_mission_control_new (void);
+
 G_END_DECLS
 
 #endif /*  __GOSSIP_UTILS_H__ */
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);