add empathy-bus-names.h

It's convenient to have a single file containing all the D-Bus names so a
component can easily call a method on another one.

Also rename from DBUS_NAME to BUS_NAME to stay coherent with the TP_BUS_NAME.

https://bugzilla.gnome.org/show_bug.cgi?id=723766

7 files changed, 40 insertions, 15 deletions

diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 267781185..b87b35b94 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -28,6 +28,7 @@ BUILT_SOURCES = 					\
 libempathy_headers =				\
 	action-chain-internal.h			\
 	empathy-auth-factory.h			\
+	empathy-bus-names.h			\
 	empathy-chatroom-manager.h		\
 	empathy-chatroom.h			\
 	empathy-client-factory.h \
diff --git a/libempathy/empathy-bus-names.h b/libempathy/empathy-bus-names.h
new file mode 100644
index 000000000..62dba700b
--- /dev/null
+++ b/libempathy/empathy-bus-names.h
@@ -0,0 +1,29 @@
+/*
+ * empathy-bus-names.h
+ *
+ * Copyright (C) 2014 Collabora Ltd. <http://www.collabora.co.uk/>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __EMPATHY_BUS_NAMES_H__
+#define __EMPATHY_BUS_NAMES_H__
+
+#define EMPATHY_BUS_NAME "org.gnome.Empathy"
+#define EMPATHY_CALL_BUS_NAME "org.gnome.Empathy.Call"
+#define EMPATHY_CHAT_BUS_NAME "org.gnome.Empathy.Chat"
+#define EMPATHY_DEBUGGER_BUS_NAME "org.gnome.Empathy.Debugger"
+#define EMPATHY_ACCOUNTS_BUS_NAME "org.gnome.EmpathyAccounts"
+
+#endif /* #ifndef __EMPATHY_BUS_NAMES_H__*/
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 60bba82dd..689c36d22 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -35,14 +35,13 @@
 #endif
 
 #include "empathy-accounts-common.h"
+#include "empathy-bus-names.h"
 #include "empathy-ui-utils.h"
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"
 
-#define EMPATHY_ACCOUNTS_DBUS_NAME "org.gnome.EmpathyAccounts"
-
 static gboolean only_if_needed = FALSE;
 static gboolean hidden = FALSE;
 static gchar *selected_account_name = NULL;
@@ -243,7 +242,7 @@ main (int argc, char *argv[])
   gdk_set_program_class ("Empathy");
   gtk_window_set_default_icon_name ("empathy");
 
-  app = gtk_application_new (EMPATHY_ACCOUNTS_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new (EMPATHY_ACCOUNTS_BUS_NAME, G_APPLICATION_FLAGS_NONE);
   app_class = G_OBJECT_GET_CLASS (app);
   G_APPLICATION_CLASS (app_class)->local_command_line = local_cmdline;
   G_APPLICATION_CLASS (app_class)->activate = app_activate;
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 3d3ae80cf..991904108 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -31,6 +31,7 @@
 #include <X11/Xlib.h>
 #endif
 
+#include "empathy-bus-names.h"
 #include "empathy-call-factory.h"
 #include "empathy-call-window.h"
 #include "empathy-ui-utils.h"
@@ -41,8 +42,6 @@
 /* Exit after $TIMEOUT seconds if not displaying any call window */
 #define TIMEOUT 60
 
-#define EMPATHY_CALL_DBUS_NAME "org.gnome.Empathy.Call"
-
 static GtkApplication *app = NULL;
 static gboolean activated = FALSE;
 static gboolean use_timer = TRUE;
@@ -255,7 +254,7 @@ main (int argc,
   g_object_set (G_OBJECT (gtk_settings), "gtk-application-prefer-dark-theme",
       TRUE, NULL);
 
-  app = gtk_application_new (EMPATHY_CALL_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new (EMPATHY_CALL_BUS_NAME, G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
 
 #ifdef ENABLE_DEBUG
diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 1c4c57d25..f25acb657 100644
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -25,6 +25,7 @@
 #include <glib/gi18n.h>
 #include <libnotify/notify.h>
 
+#include "empathy-bus-names.h"
 #include "empathy-chat-manager.h"
 #include "empathy-chat-resources.h"
 #include "empathy-presence-manager.h"
@@ -38,8 +39,6 @@
 /* Exit after $TIMEOUT seconds if not displaying any call window */
 #define TIMEOUT 60
 
-#define EMPATHY_CHAT_DBUS_NAME "org.gnome.Empathy.Chat"
-
 static GtkApplication *app = NULL;
 static gboolean activated = FALSE;
 static gboolean use_timer = TRUE;
@@ -126,7 +125,7 @@ main (int argc,
   resource = empathy_chat_get_resource ();
   g_resources_register (resource);
 
-  app = gtk_application_new (EMPATHY_CHAT_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
+  app = gtk_application_new (EMPATHY_CHAT_BUS_NAME, G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
 
 #ifdef ENABLE_DEBUG
diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index 6b5b82866..8be2be32c 100644
--- 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;
 
@@ -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;
diff --git a/src/empathy.c b/src/empathy.c
index 0d3c69421..54b06a83f 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -32,6 +32,7 @@
 
 #include "empathy-accounts-common.h"
 #include "empathy-accounts-dialog.h"
+#include "empathy-bus-names.h"
 #include "empathy-chatroom-manager.h"
 #include "empathy-client-factory.h"
 #include "empathy-connection-aggregator.h"
@@ -50,8 +51,6 @@
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
-#define EMPATHY_DBUS_NAME "org.gnome.Empathy"
-
 #define EMPATHY_TYPE_APP (empathy_app_get_type ())
 #define EMPATHY_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_APP, EmpathyApp))
 #define EMPATHY_APP_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), EMPATHY_TYPE_APP, EmpathyAppClass))
@@ -837,7 +836,7 @@ main (int argc, char *argv[])
   add_empathy_features ();
 
   app = g_object_new (EMPATHY_TYPE_APP,
-      "application-id", EMPATHY_DBUS_NAME,
+      "application-id", EMPATHY_BUS_NAME,
       NULL);
 
   retval = g_application_run (G_APPLICATION (app), argc, argv);