add empathy-bus-names.h

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

diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index ffd0341cbf58dfe72b015676495fce85c76609d3..8be2be32cd506cee6ceab62b0f4e7ca25f2efa50 100644 (file)
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -17,35 +17,110 @@
  * 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-bus-names.h"
 #include "empathy-debug-window.h"
-
-#define EMPATHY_DEBUGGER_DBUS_NAME "org.gnome.Empathy.Debugger"
+#include "empathy-ui-utils.h"
 
 static GtkWidget *window = NULL;
+static gchar *service = NULL;
 
 static void
-activate_cb (GApplication *app)
+app_activate (GApplication *app)
 {
   if (window == NULL)
     {
       window = empathy_debug_window_new (NULL);
-      g_signal_connect (window, "destroy", gtk_main_quit, NULL);
 
-      /* don't let this application exit automatically */
-      g_application_hold (G_APPLICATION (app));
+      gtk_application_add_window (GTK_APPLICATION (app),
+          GTK_WINDOW (window));
     }
   else
     {
       gtk_window_present (GTK_WINDOW (window));
     }
+
+  if (!tp_str_empty (service))
+    empathy_debug_window_show (EMPATHY_DEBUG_WINDOW (window),
+        service);
+}
+
+static void
+on_show_service_cb (GAction  *action,
+    GVariant *parameter,
+    gpointer  data)
+{
+  g_free (service);
+  service = g_variant_dup_string (parameter, NULL);
+}
+
+static gboolean
+local_cmdline (GApplication *app,
+    gchar ***arguments,
+    gint *exit_status)
+{
+  GError *error = NULL;
+  GSimpleAction *action;
+  gchar **argv;
+  gint argc = 0;
+  gint i;
+  gboolean retval = TRUE;
+
+  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 (FALSE));
+  g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
+  g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE);
+
+  action = g_simple_action_new ("show-service", G_VARIANT_TYPE_STRING);
+  g_signal_connect (action, "activate", G_CALLBACK (on_show_service_cb), app);
+  g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (action));
+  g_object_unref (action);
+
+  argv = *arguments;
+  for (i = 0; argv[i] != NULL; i++)
+    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]);
+
+      g_clear_error (&error);
+      *exit_status = EXIT_FAILURE;
+    }
+  else
+    {
+      if (g_application_register (app, NULL, &error))
+        {
+          GVariant *parameter = g_variant_new_string (service ? service : "");
+          g_action_group_activate_action (G_ACTION_GROUP (app), "show-service", parameter);
+
+          g_application_activate (app);
+        }
+      else
+        {
+          g_warning ("Impossible to register empathy-debugger: %s", error->message);
+          g_clear_error (&error);
+          *exit_status = EXIT_FAILURE;
+        }
+    }
+
+  g_option_context_free (optcontext);
+
+  return retval;
 }
 
 int
@@ -53,20 +128,21 @@ main (int argc,
     char **argv)
 {
   GtkApplication *app;
+  GApplicationClass *app_class;
   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_FLAGS_NONE);
-  g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
+  app = gtk_application_new (EMPATHY_DEBUGGER_BUS_NAME, G_APPLICATION_FLAGS_NONE);
+  app_class = G_APPLICATION_CLASS (G_OBJECT_GET_CLASS (app));
+  app_class->local_command_line = local_cmdline;
+  app_class->activate = app_activate;
 
   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");
-  textdomain (GETTEXT_PACKAGE);
 
   retval = g_application_run (G_APPLICATION (app), argc, argv);