add empathy-bus-names.h

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

diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index fb4ef1e4cec34ea61a6191911f4a2b14edeba77b..8be2be32cd506cee6ceab62b0f4e7ca25f2efa50 100644 (file)
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -21,11 +21,10 @@
 
 #include <glib/gi18n.h>
 
+#include "empathy-bus-names.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;
 
@@ -66,7 +65,7 @@ local_cmdline (GApplication *app,
   GError *error = NULL;
   GSimpleAction *action;
   gchar **argv;
-  gint argc;
+  gint argc = 0;
   gint i;
   gboolean retval = TRUE;
 
@@ -113,7 +112,7 @@ local_cmdline (GApplication *app,
         }
       else
         {
-          g_warning("Impossible to register empathy-debugger: %s", error->message);
+          g_warning ("Impossible to register empathy-debugger: %s", error->message);
           g_clear_error (&error);
           *exit_status = EXIT_FAILURE;
         }
@@ -134,7 +133,7 @@ main (int argc,
 
   textdomain (GETTEXT_PACKAGE);
 
-  app = gtk_application_new (EMPATHY_DEBUGGER_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
+  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;