[darcs-to-svn @ Automatically set presence to available when starting and to offline...

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

diff --git a/src/empathy-main.c b/src/empathy-main.c
index 2aea589f62099b13ef6c06938763b66f990ea5c6..47f2c566f11a73a5ccdf0ee2e1c56229b21348eb 100644 (file)
--- a/src/empathy-main.c
+++ b/src/empathy-main.c
@@ -35,11 +35,12 @@
 
 #include <libempathy/gossip-debug.h>
 #include <libempathy-gtk/empathy-main-window.h>
-#include <libempathy-gtk/gossip-status-presets.h>
-#include <libempathy-gtk/gossip-stock.h>
+#include <libempathy-gtk/empathy-images.h>
 #include <libempathy-gtk/gossip-accounts-dialog.h>
 
-#define DEBUG_DOMAIN "Empathy"
+#include "empathy-filter.h"
+
+#define DEBUG_DOMAIN "EmpathyMain"
 
 static void error_cb              (MissionControl *mc,
                                   GError         *error,
@@ -48,7 +49,7 @@ 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);
+                                  MissionControl *mc);
 static void icon_activate_cb      (GtkStatusIcon  *status_icon,
                                   GtkWidget      *window);
 
@@ -92,19 +93,21 @@ 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)
+destroy_cb (GtkWidget      *window,
+           MissionControl *mc)
 {
-       gossip_stock_finalize ();
+       mission_control_set_presence (mc,
+                                     MC_PRESENCE_OFFLINE,
+                                     NULL, NULL, NULL);
+
        gtk_main_quit ();
 }
 
@@ -119,6 +122,18 @@ icon_activate_cb (GtkStatusIcon *status_icon,
        }
 }
 
+static void
+new_channel_cb (EmpathyFilter *filter,
+               TpConn        *tp_conn,
+               TpChan        *tp_chan,
+               guint          context_handle,
+               gpointer       user_data)
+{
+       gossip_debug (DEBUG_DOMAIN, "Filtering context handle: %d",
+                     context_handle);
+       empathy_filter_process (filter, context_handle, TRUE);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -127,11 +142,15 @@ main (int argc, char *argv[])
        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));
+       /* 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 ();
@@ -148,13 +167,13 @@ main (int argc, char *argv[])
        window = empathy_main_window_show ();
        g_signal_connect (window, "destroy",
                          G_CALLBACK (destroy_cb),
-                         NULL);
+                         mc);
        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);
+       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);
        g_signal_connect (icon, "activate",