From 73b8a7f2e39376b75e57d9bd6f53469c5c51c1b0 Mon Sep 17 00:00:00 2001
From: "Zeeshan Ali (Khattak)" <zeeshanak@gnome.org>
Date: Fri, 8 May 2009 16:41:27 +0300
Subject: [PATCH] Plugin can provide title as well as name

Name will be more like an identifier of the plugin from now on.
---
 src/plugins/dvb/rygel-dvb-plugin.vala             | 2 +-
 src/plugins/external/rygel-external-plugin.vala   | 2 +-
 src/plugins/folder/rygel-folder-plugin.vala       | 3 ++-
 src/plugins/mediathek/rygel-mediathek-plugin.vala | 4 +---
 src/plugins/test/rygel-test-plugin.vala           | 2 +-
 src/plugins/tracker/rygel-tracker-plugin.vala     | 3 ++-
 src/rygel/rygel-plugin.vala                       | 9 ++++++++-
 7 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/plugins/dvb/rygel-dvb-plugin.vala b/src/plugins/dvb/rygel-dvb-plugin.vala
index 194b9d7..6220c0e 100644
--- a/src/plugins/dvb/rygel-dvb-plugin.vala
+++ b/src/plugins/dvb/rygel-dvb-plugin.vala
@@ -30,7 +30,7 @@ using CStuff;
 
 [ModuleInit]
 public void load_plugin (PluginLoader loader) {
-    Plugin plugin = new Plugin ("DVB");
+    Plugin plugin = new Plugin ("DVB", "Digital TV");
 
     // We only implement a ContentDirectory service
     var resource_info = new ResourceInfo (ContentDirectory.UPNP_ID,
diff --git a/src/plugins/external/rygel-external-plugin.vala b/src/plugins/external/rygel-external-plugin.vala
index b88e83e..e90a1e2 100644
--- a/src/plugins/external/rygel-external-plugin.vala
+++ b/src/plugins/external/rygel-external-plugin.vala
@@ -73,7 +73,7 @@ public class ExternalPlugin : Plugin {
         props.Get (OBJECT_IFACE, "display-name", out value);
         var title = value.get_string ();
 
-        base (title);
+        base (service_name, title);
 
         this.service_name = service_name;
         this.root_object = root_object;
diff --git a/src/plugins/folder/rygel-folder-plugin.vala b/src/plugins/folder/rygel-folder-plugin.vala
index 9ffec3c..932d66a 100644
--- a/src/plugins/folder/rygel-folder-plugin.vala
+++ b/src/plugins/folder/rygel-folder-plugin.vala
@@ -36,7 +36,8 @@ using GLib;
  */
 [ModuleInit]
 public void load_plugin (PluginLoader loader) {
-    Plugin plugin = new Plugin ("Folder");
+    var title = Environment.get_real_name () + "'s media";
+    Plugin plugin = new Plugin ("Folder", title);
 
     var resource_info = new ResourceInfo (ContentDirectory.UPNP_ID,
                                           ContentDirectory.UPNP_TYPE,
diff --git a/src/plugins/mediathek/rygel-mediathek-plugin.vala b/src/plugins/mediathek/rygel-mediathek-plugin.vala
index 5e13c97..d989876 100644
--- a/src/plugins/mediathek/rygel-mediathek-plugin.vala
+++ b/src/plugins/mediathek/rygel-mediathek-plugin.vala
@@ -25,7 +25,7 @@ using GUPnP;
 
 [ModuleInit]
 public void load_plugin (PluginLoader loader) {
-    Plugin plugin = new Plugin ("ZDFMediathek");
+    Plugin plugin = new Plugin ("ZDFMediathek", "ZDF Mediathek");
 
     var resource_info = new ResourceInfo (ContentDirectory.UPNP_ID,
                                           ContentDirectory.UPNP_TYPE,
@@ -43,5 +43,3 @@ public class Rygel.MediathekContentDir : ContentDirectory {
     }
 }
 
-
-
diff --git a/src/plugins/test/rygel-test-plugin.vala b/src/plugins/test/rygel-test-plugin.vala
index d75f9a8..f79dcc6 100644
--- a/src/plugins/test/rygel-test-plugin.vala
+++ b/src/plugins/test/rygel-test-plugin.vala
@@ -28,7 +28,7 @@ using CStuff;
 
 [ModuleInit]
 public void load_plugin (PluginLoader loader) {
-    Plugin plugin = new Plugin ("Test");
+    Plugin plugin = new Plugin ("Test", "Test Streams");
 
     // We only implement a ContentDirectory service
     var resource_info = new ResourceInfo (ContentDirectory.UPNP_ID,
diff --git a/src/plugins/tracker/rygel-tracker-plugin.vala b/src/plugins/tracker/rygel-tracker-plugin.vala
index 0ca8923..837a6c1 100644
--- a/src/plugins/tracker/rygel-tracker-plugin.vala
+++ b/src/plugins/tracker/rygel-tracker-plugin.vala
@@ -26,7 +26,8 @@ using CStuff;
 
 [ModuleInit]
 public void load_plugin (PluginLoader loader) {
-    Plugin plugin = new Plugin ("Tracker");
+    var title = Environment.get_real_name () + "'s media";
+    Plugin plugin = new Plugin ("Tracker", title);
 
     // We only implement a ContentDirectory service
     var resource_info = new ResourceInfo (ContentDirectory.UPNP_ID,
diff --git a/src/rygel/rygel-plugin.vala b/src/rygel/rygel-plugin.vala
index 9a9412e..7b169fc 100644
--- a/src/rygel/rygel-plugin.vala
+++ b/src/rygel/rygel-plugin.vala
@@ -30,12 +30,19 @@ using GUPnP;
  */
 public class Rygel.Plugin : GUPnP.ResourceFactory {
     public string name;
+    public string title;
 
     public ArrayList<ResourceInfo> resource_infos;
     public ArrayList<IconInfo> icon_infos;
 
-    public Plugin (string name) {
+    public Plugin (string  name,
+                   string? title) {
         this.name = name;
+        this.title = title;
+
+        if (title == null) {
+            this.title = name;
+        }
 
         this.resource_infos = new ArrayList<ResourceInfo> ();
         this.icon_infos = new ArrayList<IconInfo> ();
-- 
2.7.4