[tracker/gconf-dbus] libtracker-common: Use the right DBus names for gconf-dbus

[Philip Van Hoof <pvanhoof src gnome org>]

commit 03552a83cea10ee2b50ec8306ed9493d5536f371
Author: Philip Van Hoof <philip codeminded be>
Date:   Fri Apr 1 17:24:34 2011 +0200

    libtracker-common: Use the right DBus names for gconf-dbus

 src/libtracker-common/tracker-locale-gconfdbus.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/src/libtracker-common/tracker-locale-gconfdbus.c b/src/libtracker-common/tracker-locale-gconfdbus.c
index 2b44663..75f7c08 100644
--- a/src/libtracker-common/tracker-locale-gconfdbus.c
+++ b/src/libtracker-common/tracker-locale-gconfdbus.c
@@ -28,12 +28,16 @@
 
 #include "tracker-locale-gconfdbus.h"
 
-#define GCONF_DBUS_SERVICE                    "org.gnome.GConfDBus"
-#define GCONF_DBUS_SERVER_INTERFACE           "org.gnome.GConfDBus.Server"
-#define GCONF_DBUS_DATABASE_INTERFACE         "org.gnome.GConfDBus.Database"
-#define GCONF_DBUS_SERVER_OBJECT              "/org/gnome/GConfDBus/Server"
-#define GCONF_DBUS_CLIENT_OBJECT              "/org/gnome/GConfDBus/Client"
-#define GCONF_DBUS_CLIENT_INTERFACE           "org.gnome.GConfDBus.Client"
+/* This helps with testing, change all the names in gconf-dbus and then you
+ * can run it in parallel with an upstream gconf-d of the GNOME platform */
+#define GCONF_DBUS_NAME "GConf"
+
+#define GCONF_DBUS_SERVICE                    "org.gnome." GCONF_DBUS_NAME
+#define GCONF_DBUS_SERVER_INTERFACE           "org.gnome." GCONF_DBUS_NAME ".Server"
+#define GCONF_DBUS_DATABASE_INTERFACE         "org.gnome." GCONF_DBUS_NAME ".Database"
+#define GCONF_DBUS_SERVER_OBJECT              "/org/gnome/" GCONF_DBUS_NAME "/Server"
+#define GCONF_DBUS_CLIENT_OBJECT              "/org/gnome/" GCONF_DBUS_NAME "/Client"
+#define GCONF_DBUS_CLIENT_INTERFACE           "org.gnome." GCONF_DBUS_NAME ".Client"
 
 /* Base dir for all gconf locale values */
 #define MEEGOTOUCH_LOCALE_DIR                 "/meegotouch/i18n"