[darcs-to-svn @ GossipAboutDialog]

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

diff --git a/src/empathy-main.c b/src/empathy-main.c
index 2aea589f62099b13ef6c06938763b66f990ea5c6..8dcc52c4b67452b73799d1cea4a08f54d6c2618b 100644 (file)
--- a/src/empathy-main.c
+++ b/src/empathy-main.c
@@ -27,30 +27,30 @@
 #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/gossip-status-presets.h>
-#include <libempathy-gtk/gossip-stock.h>
-#include <libempathy-gtk/gossip-accounts-dialog.h>
-
-#define DEBUG_DOMAIN "Empathy"
-
-static void error_cb              (MissionControl *mc,
-                                  GError         *error,
-                                  gpointer        data);
-static void service_ended_cb      (MissionControl *mc,
-                                  gpointer        user_data);
-static void start_mission_control (MissionControl *mc);
-static void destroy_cb            (GtkWidget      *window,
-                                  gpointer        user_data);
-static void icon_activate_cb      (GtkStatusIcon  *status_icon,
-                                  GtkWidget      *window);
+#include <libempathy-gtk/empathy-status-icon.h>
+
+#include "empathy-filter.h"
+
+#define DEBUG_DOMAIN "EmpathyMain"
+
+static void error_cb              (MissionControl    *mc,
+                                  GError            *error,
+                                  gpointer           data);
+static void service_ended_cb      (MissionControl    *mc,
+                                  gpointer           user_data);
+static void operation_error_cb    (MissionControl    *mc,
+                                  guint              operation_id,
+                                  guint              error_code,
+                                  gpointer           user_data);
+static void start_mission_control (MissionControl    *mc);
 
 static void
 error_cb (MissionControl *mc,
@@ -69,6 +69,17 @@ service_ended_cb (MissionControl *mc,
        gossip_debug (DEBUG_DOMAIN, "Mission Control stopped");
 }
 
+static void
+operation_error_cb (MissionControl *mc,
+                   guint           operation_id,
+                   guint           error_code,
+                   gpointer        user_data)
+{
+       gossip_debug (DEBUG_DOMAIN, "Error code %d during operation %d",
+                     error_code,
+                     operation_id);
+}
+
 static void
 account_enabled_cb (McAccountMonitor *monitor,
                    gchar            *unique_name,
@@ -92,85 +103,68 @@ start_mission_control (MissionControl *mc)
 
        gossip_debug (DEBUG_DOMAIN, "Starting Mission Control...");
 
-       gossip_status_presets_get_all ();
        mission_control_set_presence (mc,
-                                     gossip_status_presets_get_default_state (),
-                                     gossip_status_presets_get_default_status (),
+                                     MC_PRESENCE_AVAILABLE,
+                                     NULL,
                                      (McCallback) error_cb,
                                      NULL);
 }
 
 static void
-destroy_cb (GtkWidget *window,
-           gpointer   user_data)
-{
-       gossip_stock_finalize ();
-       gtk_main_quit ();
-}
-
-static void
-icon_activate_cb (GtkStatusIcon *status_icon,
-                 GtkWidget     *window)
+new_channel_cb (EmpathyFilter *filter,
+               TpConn        *tp_conn,
+               TpChan        *tp_chan,
+               guint          context_handle,
+               gpointer       user_data)
 {
-       if (GTK_WIDGET_VISIBLE (window)) {
-               gtk_widget_hide (window);
-       } else {
-               gtk_widget_show (window);
-       }
+       gossip_debug (DEBUG_DOMAIN, "Filtering context handle: %d",
+                     context_handle);
+       empathy_filter_process (filter, context_handle, TRUE);
 }
 
 int
 main (int argc, char *argv[])
 {
-       GList            *accounts;
-       GtkStatusIcon    *icon;
-       GtkWidget        *window;
-       MissionControl   *mc;
-       McAccountMonitor *monitor;
+       EmpathyStatusIcon *icon;
+       GtkWidget         *window;
+       MissionControl    *mc;
+       McAccountMonitor  *monitor;
+       EmpathyFilter     *filter;
 
        gtk_init (&argc, &argv);
 
-       /* FIXME: This is a horrible hack */
-       gossip_stock_init (gtk_window_new (GTK_WINDOW_TOPLEVEL));
+       g_set_application_name (PACKAGE_NAME);
+
+       /* Setting up channel filter */
+       filter = empathy_filter_new ();
+       g_signal_connect (filter, "new-channel",
+                         G_CALLBACK (new_channel_cb),
+                         NULL);
 
        /* 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);
        g_signal_connect (mc, "ServiceEnded",
                          G_CALLBACK (service_ended_cb),
                          NULL);
+       g_signal_connect (mc, "Error",
+                         G_CALLBACK (operation_error_cb),
+                         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),
-                         NULL);
-       g_signal_connect (window, "delete-event",
-                         G_CALLBACK (gtk_widget_hide_on_delete),
-                         NULL);
-
-       /* Setting up the tray icon */
-       icon = gtk_status_icon_new_from_stock (GOSSIP_STOCK_MESSAGE);
-       gtk_status_icon_set_tooltip (icon, "Empathy - click here to show/hide the main window");
-       gtk_status_icon_set_visible (icon, TRUE);
-       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);