New window for viewing logs.

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

diff --git a/src/empathy-main.c b/src/empathy-main.c
index d693ba6b5221e64585d81551e92618a4b9f6e5e5..92a66b2c89eb29757ce279245165049bc667d7c2 100644 (file)
--- a/src/empathy-main.c
+++ b/src/empathy-main.c
@@ -25,8 +25,12 @@
 #include <stdlib.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
+#include <libgnome/gnome-program.h>
+#include <libgnomeui/gnome-ui-init.h>
+
 #include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mc-account-monitor.h>
 #include <libmissioncontrol/mission-control.h>
@@ -37,20 +41,18 @@
 #include <libempathy-gtk/empathy-main-window.h>
 #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,
+                                  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,
@@ -110,18 +112,6 @@ start_mission_control (MissionControl *mc)
                                      NULL);
 }
 
-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[])
 {
@@ -129,15 +119,38 @@ main (int argc, char *argv[])
        GtkWidget         *window;
        MissionControl    *mc;
        McAccountMonitor  *monitor;
-       EmpathyFilter     *filter;
-
-       gtk_init (&argc, &argv);
+       GnomeProgram      *program;
+       gboolean           no_connect = FALSE;
+       GOptionContext    *context;
+       GOptionEntry       options[] = {
+               { "no-connect", 'n',
+                 0, G_OPTION_ARG_NONE, &no_connect,
+                 N_("Don't connect on startup"),
+                 NULL },
+               { NULL }
+       };
+
+       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+       textdomain (GETTEXT_PACKAGE);
+
+       context = g_option_context_new (_("- Empathy Instant Messenger"));
+       g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
+
+       g_set_application_name (PACKAGE_NAME);
+
+       program = gnome_program_init ("empathy",
+                                     PACKAGE_VERSION,
+                                     LIBGNOMEUI_MODULE,
+                                     argc, argv,
+                                     GNOME_PROGRAM_STANDARD_PROPERTIES,
+                                     "goption-context", context,
+                                     GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME,
+                                     NULL);
 
-       /* Setting up channel filter */
-       filter = empathy_filter_new ();
-       g_signal_connect (filter, "new-channel",
-                         G_CALLBACK (new_channel_cb),
-                         NULL);
+       gtk_window_set_default_icon_name ("empathy");
+       gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+                                          DATADIR G_DIR_SEPARATOR_S "empathy");
 
        /* Setting up MC */
        monitor = mc_account_monitor_new ();
@@ -151,7 +164,10 @@ main (int argc, char *argv[])
        g_signal_connect (mc, "Error",
                          G_CALLBACK (operation_error_cb),
                          NULL);
-       start_mission_control (mc);
+
+       if (!no_connect) {
+               start_mission_control (mc);
+       }
 
        /* Setting up UI */
        window = empathy_main_window_show ();
@@ -166,6 +182,7 @@ main (int argc, char *argv[])
        g_object_unref (monitor);
        g_object_unref (mc);
        g_object_unref (icon);
+       g_object_unref (program);
 
        return EXIT_SUCCESS;
 }