core,external: Avoid symbol redefintion

On C level, the vala DBus interface object and this constant both create
a FREE_DESKTOP_DBUS_OBJECT definition, creating a GCC warning when using
librygel-core.

diff --git a/src/librygel-core/rygel-free-desktop-interfaces.vala b/src/librygel-core/rygel-free-desktop-interfaces.vala
index e6100f2..9a92913 100644 (file)
--- a/src/librygel-core/rygel-free-desktop-interfaces.vala
+++ b/src/librygel-core/rygel-free-desktop-interfaces.vala
@@ -23,7 +23,7 @@
 
 namespace FreeDesktop {
     public const string DBUS_SERVICE = "org.freedesktop.DBus";
-    public const string DBUS_OBJECT = "/org/freedesktop/DBus";
+    public const string DBUS_OBJECT_PATH = "/org/freedesktop/DBus";
 }
 
 public enum FreeDesktop.DBusRequestNameReply {

diff --git a/src/plugins/external/rygel-external-plugin-factory.vala b/src/plugins/external/rygel-external-plugin-factory.vala
index 8d4f90f..078871d 100644 (file)
--- a/src/plugins/external/rygel-external-plugin-factory.vala
+++ b/src/plugins/external/rygel-external-plugin-factory.vala
@@ -58,7 +58,7 @@ public class Rygel.External.PluginFactory {
         this.dbus_obj = Bus.get_proxy_sync
                                         (BusType.SESSION,
                                          DBUS_SERVICE,
-                                         DBUS_OBJECT,
+                                         DBUS_OBJECT_PATH,
                                          DBusProxyFlags.DO_NOT_LOAD_PROPERTIES);
         this.loader = loader;