Use the new keywords

Use the new keywords for username and realname subsitution: @USERNAME@ and
@REALNAME@ instead of '%u' and '%n' respectively.

diff --git a/src/plugins/folder/rygel-folder-plugin.vala b/src/plugins/folder/rygel-folder-plugin.vala
index 0c871bf..1c48f4e 100644 (file)
--- a/src/plugins/folder/rygel-folder-plugin.vala
+++ b/src/plugins/folder/rygel-folder-plugin.vala
@@ -36,7 +36,7 @@ using GLib;
  */
 [ModuleInit]
 public void module_init (PluginLoader loader) {
-    Plugin plugin = new Plugin ("Folder", "%n's media");
+    Plugin plugin = new Plugin ("Folder", "@REALNAME@'s media");
 
     var resource_info = new ResourceInfo (ContentDirectory.UPNP_ID,
                                           ContentDirectory.UPNP_TYPE,

diff --git a/src/plugins/tracker/rygel-tracker-plugin.vala b/src/plugins/tracker/rygel-tracker-plugin.vala
index d563598..23105e9 100644 (file)
--- a/src/plugins/tracker/rygel-tracker-plugin.vala
+++ b/src/plugins/tracker/rygel-tracker-plugin.vala
@@ -26,7 +26,7 @@ using CStuff;
 
 [ModuleInit]
 public void module_init (PluginLoader loader) {
-    Plugin plugin = new Plugin ("Tracker", "%n's media");
+    Plugin plugin = new Plugin ("Tracker", "@REALNAME@'s media");
 
     // We only implement a ContentDirectory service
     var resource_info = new ResourceInfo (ContentDirectory.UPNP_ID,

diff --git a/src/rygel/rygel-media-server-factory.vala b/src/rygel/rygel-media-server-factory.vala
index c1aee57..0c30c58 100644 (file)
--- a/src/rygel/rygel-media-server-factory.vala
+++ b/src/rygel/rygel-media-server-factory.vala
@@ -148,8 +148,8 @@ public class Rygel.MediaServerFactory {
         }
 
         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 ());
+        title = title.replace ("@REALNAME@", Environment.get_real_name ());
+        title = title.replace ("@USERNAME@", Environment.get_user_name ());
 
         element->set_content (title);