[darcs-to-svn @ Connect accounts in empathy-launcher, not in empathy-contact-list]

[empathy.git] / libempathy / empathy-session.c

diff --git a/libempathy/empathy-session.c b/libempathy/empathy-session.c
index 1a46a9cd275b98dec7115b2c435f5adfdec04df1..86ac1e18038795bc53e36b6bfbbc4a9203050fcd 100644 (file)
--- a/libempathy/empathy-session.c
+++ b/libempathy/empathy-session.c
@@ -33,70 +33,17 @@
 
 #define DEBUG_DOMAIN "Session"
 
-static void session_start_mission_control (void);
-static void session_error_cb              (MissionControl   *mc,
-                                          GError           *error,
-                                          gpointer          data);
-static void session_account_enabled_cb    (McAccountMonitor *monitor,
-                                          gchar            *unique_name,
-                                          gpointer          user_data);
-static void session_service_ended_cb      (MissionControl   *mc,
-                                          gpointer          user_data);
-
-static MissionControl        *mission_control = NULL;
 static EmpathyContactManager *contact_manager = NULL;
 
-void
-empathy_session_connect (void)
-{
-       MissionControl   *mc;
-       McAccountMonitor *monitor;
-       static gboolean   started = FALSE;
-
-       if (started) {
-               return;
-       }
-
-       mc = empathy_session_get_mission_control ();
-       monitor = mc_account_monitor_new ();
-
-       g_signal_connect (monitor, "account-enabled",
-                         G_CALLBACK (session_account_enabled_cb),
-                         NULL);
-       g_signal_connect (mc, "ServiceEnded",
-                         G_CALLBACK (session_service_ended_cb),
-                         NULL);
-
-       g_object_unref (monitor);
-       session_start_mission_control ();
-
-       started = TRUE;
-}
-
 void
 empathy_session_finalize (void)
 {
-       if (mission_control) {
-               g_object_unref (mission_control);
-               mission_control = NULL;
-       }
-
        if (contact_manager) {
                g_object_unref (contact_manager);
                contact_manager = NULL;
        }
 }
 
-MissionControl *
-empathy_session_get_mission_control (void)
-{
-       if (!mission_control) {
-               mission_control = mission_control_new (tp_get_bus ());
-       }
-
-       return mission_control;
-}
-
 EmpathyContactManager *
 empathy_session_get_contact_manager (void)
 {
@@ -107,57 +54,3 @@ empathy_session_get_contact_manager (void)
        return contact_manager;
 }
 
-static void
-session_start_mission_control (void)
-{
-       MissionControl *mc;
-       McPresence      presence;
-
-       mc = empathy_session_get_mission_control ();
-       presence = mission_control_get_presence_actual (mc, NULL);
-
-       if (presence != MC_PRESENCE_UNSET &&
-           presence != MC_PRESENCE_OFFLINE) {
-               /* MC is already running and online, nothing to do */
-               return;
-       }
-
-       gossip_debug (DEBUG_DOMAIN, "Starting Mission Control...");
-
-       /* FIXME: Save/Restore status message */
-       mission_control_set_presence (mc, MC_PRESENCE_AVAILABLE,
-                                     NULL,
-                                     (McCallback) session_error_cb,
-                                     NULL);
-
-       mission_control_connect_all_with_default_presence (mc,
-                                                          (McCallback) session_error_cb,
-                                                          NULL);
-}
-
-static void
-session_error_cb (MissionControl *mc,
-                 GError         *error,
-                 gpointer        data)
-{
-       if (error) {
-               gossip_debug (DEBUG_DOMAIN, "Error: %s", error->message);
-       }
-}
-
-static void
-session_account_enabled_cb (McAccountMonitor *monitor,
-                           gchar            *unique_name,
-                           gpointer          user_data)
-{
-       gossip_debug (DEBUG_DOMAIN, "Account enabled: %s", unique_name);
-       session_start_mission_control ();
-}
-
-static void
-session_service_ended_cb (MissionControl *mc,
-                         gpointer        user_data)
-{
-       gossip_debug (DEBUG_DOMAIN, "Mission Control stopped");
-}
-