diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-06 21:58:51 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-06 22:32:57 +0800 |
| commit | e5995a21713cb333285f8a4bf5a612e11f6e271a (patch) | |
| tree | 702198d743eb12809f89ba5aaff4e8e3991a2bba /src/empathy.c | |
| parent | 983d1b03fa252ea5743d58f290ab70be8fa8c291 (diff) | |
| download | gsoc2013-empathy-e5995a21713cb333285f8a4bf5a612e11f6e271a.tar gsoc2013-empathy-e5995a21713cb333285f8a4bf5a612e11f6e271a.tar.gz gsoc2013-empathy-e5995a21713cb333285f8a4bf5a612e11f6e271a.tar.bz2 gsoc2013-empathy-e5995a21713cb333285f8a4bf5a612e11f6e271a.tar.lz gsoc2013-empathy-e5995a21713cb333285f8a4bf5a612e11f6e271a.tar.xz gsoc2013-empathy-e5995a21713cb333285f8a4bf5a612e11f6e271a.tar.zst gsoc2013-empathy-e5995a21713cb333285f8a4bf5a612e11f6e271a.zip | |
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
Diffstat (limited to 'src/empathy.c')
| -rw-r--r-- | src/empathy.c | 5 |
1 files changed, 2 insertions, 3 deletions
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); |