[rygel] Honor the default title provided by plugins

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 47fcdd1df742e3662a0815c8f5c3380f3ecc5df4
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Fri May 8 18:19:02 2009 +0300

    Honor the default title provided by plugins
---
 src/rygel/rygel-media-server-factory.vala |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/rygel/rygel-media-server-factory.vala b/src/rygel/rygel-media-server-factory.vala
index d4117a8..c1aee57 100644
--- a/src/rygel/rygel-media-server-factory.vala
+++ b/src/rygel/rygel-media-server-factory.vala
@@ -119,7 +119,9 @@ public class Rygel.MediaServerFactory {
         }
 
         /* First, set the Friendly name and UDN */
-        this.set_friendly_name_and_udn (device_element, plugin.name);
+        this.set_friendly_name_and_udn (device_element,
+                                        plugin.name,
+                                        plugin.title);
 
         /* Then list each icon */
         this.add_icons_to_desc (device_element, plugin);
@@ -133,7 +135,8 @@ public class Rygel.MediaServerFactory {
      * If these keys are not present in gconf, they are set with default values.
      */
     private void set_friendly_name_and_udn (Xml.Node *device_element,
-                                            string    plugin_name) {
+                                            string    plugin_name,
+                                            string    plugin_title) {
         /* friendlyName */
         Xml.Node *element = Utils.get_xml_element (device_element,
                                                    "friendlyName",
@@ -144,7 +147,7 @@ public class Rygel.MediaServerFactory {
             return;
         }
 
-        var title = this.config.get_title (plugin_name);
+        var title = this.config.get_title (plugin_name, plugin_title);
         title = title.replace ("%n", Environment.get_real_name ());
         title = title.replace ("%u", Environment.get_user_name ());