[darcs-to-svn @ GossipAboutDialog]

[empathy.git] / src / empathy-main.c

diff --git a/src/empathy-main.c b/src/empathy-main.c
index c2cb2ec51270f3d7d595878b669bb062a7038dab..8dcc52c4b67452b73799d1cea4a08f54d6c2618b 100644 (file)
--- a/src/empathy-main.c
+++ b/src/empathy-main.c
@@ -27,17 +27,15 @@
 #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>
-#include <libempathy-gtk/gossip-accounts-dialog.h>
 
 #include "empathy-filter.h"
 
@@ -53,10 +51,6 @@ static void operation_error_cb    (MissionControl    *mc,
                                   guint              error_code,
                                   gpointer           user_data);
 static void start_mission_control (MissionControl    *mc);
-static void destroy_cb            (GtkWidget         *window,
-                                  MissionControl    *mc);
-static void icon_activate_cb      (EmpathyStatusIcon *icon,
-                                  GtkWidget         *window);
 
 static void
 error_cb (MissionControl *mc,
@@ -116,28 +110,6 @@ start_mission_control (MissionControl *mc)
                                      NULL);
 }
 
-static void
-destroy_cb (GtkWidget      *window,
-           MissionControl *mc)
-{
-       mission_control_set_presence (mc,
-                                     MC_PRESENCE_OFFLINE,
-                                     NULL, NULL, NULL);
-
-       gtk_main_quit ();
-}
-
-static void
-icon_activate_cb (EmpathyStatusIcon *icon,
-                 GtkWidget         *window)
-{
-       if (GTK_WIDGET_VISIBLE (window)) {
-               gtk_widget_hide (window);
-       } else {
-               gtk_widget_show (window);
-       }
-}
-
 static void
 new_channel_cb (EmpathyFilter *filter,
                TpConn        *tp_conn,
@@ -153,7 +125,6 @@ new_channel_cb (EmpathyFilter *filter,
 int
 main (int argc, char *argv[])
 {
-       GList             *accounts;
        EmpathyStatusIcon *icon;
        GtkWidget         *window;
        MissionControl    *mc;
@@ -162,6 +133,8 @@ main (int argc, char *argv[])
 
        gtk_init (&argc, &argv);
 
+       g_set_application_name (PACKAGE_NAME);
+
        /* Setting up channel filter */
        filter = empathy_filter_new ();
        g_signal_connect (filter, "new-channel",
@@ -170,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);
@@ -182,31 +155,16 @@ main (int argc, char *argv[])
                          NULL);
        start_mission_control (mc);
 
-       /* Setting up the main window */
+       /* Setting up UI */
        window = empathy_main_window_show ();
-       g_signal_connect (window, "destroy",
-                         G_CALLBACK (destroy_cb),
-                         mc);
-       g_signal_connect (window, "delete-event",
-                         G_CALLBACK (gtk_widget_hide_on_delete),
-                         NULL);
-
-       /* Setting up the status icon */
-       icon = empathy_status_icon_new ();
-       g_signal_connect (icon, "activate",
-                         G_CALLBACK (icon_activate_cb),
-                         window);
-
-       /* Show the accounts dialog if there is no enabled accounts */
-       accounts = mc_accounts_list_by_enabled (TRUE);
-       if (accounts) {
-               mc_accounts_list_free (accounts);
-       } else {
-               gossip_accounts_dialog_show ();
-       }
+       icon = empathy_status_icon_new (GTK_WINDOW (window));
 
        gtk_main ();
 
+       mission_control_set_presence (mc,
+                                     MC_PRESENCE_OFFLINE,
+                                     NULL, NULL, NULL);
+
        g_object_unref (monitor);
        g_object_unref (mc);
        g_object_unref (icon);