Move the constants into class definitions

diff --git a/src/plugins/external/rygel-external-plugin-factory.vala b/src/plugins/external/rygel-external-plugin-factory.vala
index 4539fcf..f0573b8 100644 (file)
--- a/src/plugins/external/rygel-external-plugin-factory.vala
+++ b/src/plugins/external/rygel-external-plugin-factory.vala
@@ -26,12 +26,6 @@ using Rygel;
 using Gee;
 using CStuff;
 
-private const string DBUS_SERVICE = "org.freedesktop.DBus";
-private const string DBUS_OBJECT = "/org/freedesktop/DBus";
-private const string DBUS_IFACE = "org.freedesktop.DBus";
-
-private const string SERVICE_PREFIX = "org.Rygel.MediaServer1.";
-
 private ExternalPluginFactory plugin_factory;
 
 [ModuleInit]
@@ -45,6 +39,12 @@ public void module_init (PluginLoader loader) {
 }
 
 public class ExternalPluginFactory {
+    private const string DBUS_SERVICE = "org.freedesktop.DBus";
+    private const string DBUS_OBJECT = "/org/freedesktop/DBus";
+    private const string DBUS_IFACE = "org.freedesktop.DBus";
+
+    private const string SERVICE_PREFIX = "org.Rygel.MediaServer1.";
+
     dynamic DBus.Object dbus_obj;
     DBus.Connection     connection;
     PluginLoader        loader;

diff --git a/src/plugins/external/rygel-external-plugin.vala b/src/plugins/external/rygel-external-plugin.vala
index 83b5d38..a827e12 100644 (file)
--- a/src/plugins/external/rygel-external-plugin.vala
+++ b/src/plugins/external/rygel-external-plugin.vala
@@ -24,11 +24,11 @@
 
 using Rygel;
 
-private const string PROPS_IFACE = "org.freedesktop.DBus.Properties";
-private const string OBJECT_IFACE = "org.Rygel.MediaObject1";
-
 public class ExternalPlugin : Plugin {
     // class-wide constants
+    private const string PROPS_IFACE = "org.freedesktop.DBus.Properties";
+    private const string OBJECT_IFACE = "org.Rygel.MediaObject1";
+
     public string service_name;
     public string root_object;