[darcs-to-svn @ connect to the error signal on MC]

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

diff --git a/src/empathy-main.c b/src/empathy-main.c
index 47f2c566f11a73a5ccdf0ee2e1c56229b21348eb..c2cb2ec51270f3d7d595878b669bb062a7038dab 100644 (file)
--- a/src/empathy-main.c
+++ b/src/empathy-main.c
@@ -34,24 +34,29 @@
 #include <libmissioncontrol/mission-control.h>
 
 #include <libempathy/gossip-debug.h>
+#include <libempathy/gossip-presence.h>
 #include <libempathy-gtk/empathy-main-window.h>
-#include <libempathy-gtk/empathy-images.h>
+#include <libempathy-gtk/empathy-status-icon.h>
 #include <libempathy-gtk/gossip-accounts-dialog.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 start_mission_control (MissionControl *mc);
-static void destroy_cb            (GtkWidget      *window,
-                                  MissionControl *mc);
-static void icon_activate_cb      (GtkStatusIcon  *status_icon,
-                                  GtkWidget      *window);
+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 destroy_cb            (GtkWidget         *window,
+                                  MissionControl    *mc);
+static void icon_activate_cb      (EmpathyStatusIcon *icon,
+                                  GtkWidget         *window);
 
 static void
 error_cb (MissionControl *mc,
@@ -70,6 +75,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,
@@ -112,8 +128,8 @@ destroy_cb (GtkWidget      *window,
 }
 
 static void
-icon_activate_cb (GtkStatusIcon *status_icon,
-                 GtkWidget     *window)
+icon_activate_cb (EmpathyStatusIcon *icon,
+                 GtkWidget         *window)
 {
        if (GTK_WIDGET_VISIBLE (window)) {
                gtk_widget_hide (window);
@@ -137,12 +153,12 @@ new_channel_cb (EmpathyFilter *filter,
 int
 main (int argc, char *argv[])
 {
-       GList            *accounts;
-       GtkStatusIcon    *icon;
-       GtkWidget        *window;
-       MissionControl   *mc;
-       McAccountMonitor *monitor;
-       EmpathyFilter    *filter;
+       GList             *accounts;
+       EmpathyStatusIcon *icon;
+       GtkWidget         *window;
+       MissionControl    *mc;
+       McAccountMonitor  *monitor;
+       EmpathyFilter     *filter;
 
        gtk_init (&argc, &argv);
 
@@ -161,6 +177,9 @@ main (int argc, char *argv[])
        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 */
@@ -172,10 +191,8 @@ main (int argc, char *argv[])
                          G_CALLBACK (gtk_widget_hide_on_delete),
                          NULL);
 
-       /* Setting up the tray icon */
-       icon = gtk_status_icon_new_from_icon_name (EMPATHY_IMAGE_MESSAGE);
-       gtk_status_icon_set_tooltip (icon, "Empathy - click here to show/hide the main window");
-       gtk_status_icon_set_visible (icon, TRUE);
+       /* Setting up the status icon */
+       icon = empathy_status_icon_new ();
        g_signal_connect (icon, "activate",
                          G_CALLBACK (icon_activate_cb),
                          window);