Merge branch 'gnome-3-8'

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

diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index ef6f503f1297d418706a6f6f0c71ad6c601e8e4b..abb73ac444d13e5159ec591c52159d816891c966 100644 (file)
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -17,34 +17,105 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
 #include "empathy-debug-window.h"
+#include "empathy-ui-utils.h"
+
+#define EMPATHY_DEBUGGER_DBUS_NAME "org.gnome.Empathy.Debugger"
+
+static GtkWidget *window = NULL;
+static gchar *service = NULL;
+
+static void
+activate_cb (GApplication *app)
+{
+  if (window == NULL)
+    {
+      window = empathy_debug_window_new (NULL);
+
+      gtk_application_add_window (GTK_APPLICATION (app),
+          GTK_WINDOW (window));
+    }
+  else
+    {
+      gtk_window_present (GTK_WINDOW (window));
+    }
+
+  if (service != NULL)
+    empathy_debug_window_show (EMPATHY_DEBUG_WINDOW (window),
+        service);
+}
+
+static gint
+command_line_cb (GApplication *application,
+    GApplicationCommandLine *command_line,
+    gpointer user_data)
+{
+  GError *error = NULL;
+  gchar **argv;
+  gint argc;
+  gint retval = 0;
+
+  GOptionContext *optcontext;
+  GOptionEntry options[] = {
+      { "show-service", 's',
+        0, G_OPTION_ARG_STRING, &service,
+        N_("Show a particular service"),
+        NULL },
+      { NULL }
+  };
+
+  optcontext = g_option_context_new (N_("- Empathy Debugger"));
+  g_option_context_add_group (optcontext, gtk_get_option_group (TRUE));
+  g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
+  g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE);
+  argv = g_application_command_line_get_arguments (command_line, &argc);
+
+  if (!g_option_context_parse (optcontext, &argc, &argv, &error))
+    {
+      g_print ("%s\nRun '%s --help' to see a full list of available command "
+          "line options.\n",
+          error->message, argv[0]);
+
+      retval = 1;
+    }
+
+  g_option_context_free (optcontext);
+  g_strfreev (argv);
+
+  g_application_activate (application);
+
+  return retval;
+}
 
 int
 main (int argc,
     char **argv)
 {
-  GtkWidget *window;
+  GtkApplication *app;
+  gint retval;
 
-  g_thread_init (NULL);
   gtk_init (&argc, &argv);
   empathy_gtk_init ();
+  textdomain (GETTEXT_PACKAGE);
+
+  app = gtk_application_new (EMPATHY_DEBUGGER_DBUS_NAME,
+      G_APPLICATION_HANDLES_COMMAND_LINE);
+  g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
+  g_signal_connect (app, "command-line", G_CALLBACK (command_line_cb), NULL);
 
-  g_set_application_name (_(PACKAGE_NAME " Debugger"));
+  g_set_application_name (_("Empathy Debugger"));
 
+  /* Make empathy and empathy-debugger appear as the same app in gnome-shell */
+  gdk_set_program_class ("Empathy");
   gtk_window_set_default_icon_name ("empathy");
 
-  window = empathy_debug_window_new (NULL);
-  g_signal_connect (window, "destroy", gtk_main_quit, NULL);
+  retval = g_application_run (G_APPLICATION (app), argc, argv);
 
-  gtk_main ();
+  g_object_unref (app);
 
-  return EXIT_SUCCESS;
+  return retval;
 }