[rygel] media-export: Plugin name in the Plugin class



commit 543ba4bcb15915a4db81d95ec7a5030563a7a4cb
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Wed Feb 9 16:28:31 2011 +0200

    media-export: Plugin name in the Plugin class

 .../media-export/rygel-media-export-plugin.vala    |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/src/plugins/media-export/rygel-media-export-plugin.vala b/src/plugins/media-export/rygel-media-export-plugin.vala
index bdf30f3..3b88997 100644
--- a/src/plugins/media-export/rygel-media-export-plugin.vala
+++ b/src/plugins/media-export/rygel-media-export-plugin.vala
@@ -22,15 +22,15 @@ using Rygel;
 using GUPnP;
 
 private const string TRACKER_PLUGIN = "Tracker";
-private const string OUR_PLUGIN = "MediaExport";
 
 /**
  * Simple plugin which exposes the media contents of a directory via UPnP.
  *
  */
 public void module_init (PluginLoader loader) {
-    if (loader.plugin_disabled (OUR_PLUGIN)) {
-        message ("Plugin '%s' disabled by user, ignoring..", OUR_PLUGIN);
+    if (loader.plugin_disabled (MediaExport.Plugin.NAME)) {
+        message ("Plugin '%s' disabled by user, ignoring..",
+                 MediaExport.Plugin.NAME);
 
         return;
     }
@@ -41,7 +41,7 @@ public void module_init (PluginLoader loader) {
         plugin = new MediaExport.Plugin ();
     } catch (Error error) {
         warning ("Failed to initialize plugin '%s': %s. Ignoring..",
-                 OUR_PLUGIN,
+                 MediaExport.Plugin.NAME,
                  error.message);
 
         return;
@@ -67,7 +67,7 @@ public void on_plugin_available (Plugin plugin, Plugin our_plugin) {
         our_plugin.active == plugin.active) {
         if (plugin.active) {
             message ("Deactivating plugin '%s' in favor of plugin '%s'",
-                     OUR_PLUGIN,
+                     MediaExport.Plugin.NAME,
                      TRACKER_PLUGIN);
             try {
                 var config = MetaConfig.get_default ();
@@ -82,7 +82,7 @@ public void on_plugin_available (Plugin plugin, Plugin our_plugin) {
         } else {
             message ("Plugin '%s' inactivate, activating '%s' plugin",
                      TRACKER_PLUGIN,
-                     OUR_PLUGIN);
+                     MediaExport.Plugin.NAME);
         }
 
         our_plugin.active = !plugin.active;
@@ -90,7 +90,9 @@ public void on_plugin_available (Plugin plugin, Plugin our_plugin) {
 }
 
 public class Rygel.MediaExport.Plugin : Rygel.MediaServerPlugin {
+    public const string NAME = "MediaExport";
+
     public Plugin () throws Error {
-        base (RootContainer.get_instance (), OUR_PLUGIN);
+        base (RootContainer.get_instance (), NAME);
     }
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]