Rename gconf key from folder to folders

Folder was a legacy from when the plugin was meant
to only export a single folder; this is not true anymore
and the key has been renamed to reflect this

diff --git a/data/rygel.schemas b/data/rygel.schemas
index 2e19290..8a178b6 100644 (file)
--- a/data/rygel.schemas
+++ b/data/rygel.schemas
@@ -111,8 +111,8 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/rygel/Folder/folder</key>
-        <applyto>/apps/rygel/Folder/folder</applyto>
+        <key>/schemas/apps/rygel/Folder/folders</key>
+        <applyto>/apps/rygel/Folder/folders</applyto>
         <owner>rygel</owner>
         <type>list</type>
         <list_type>string</list_type>

diff --git a/src/plugins/folder/rygel-folder-root-container.vala b/src/plugins/folder/rygel-folder-root-container.vala
index 8865fa9..8aa5c4e 100644 (file)
--- a/src/plugins/folder/rygel-folder-root-container.vala
+++ b/src/plugins/folder/rygel-folder-root-container.vala
@@ -104,10 +104,10 @@ public class Rygel.FolderRootContainer : MediaContainer {
         unowned SList<string> dirs = null;
 
         try {
-            dirs = client.get_list ("/apps/rygel/Folder/folder", 
+            dirs = client.get_list ("/apps/rygel/Folder/folders",
                                     GConf.ValueType.STRING);
         } catch (GLib.Error error) {
-            message("Error fetching configuration, error was %s", 
+            message("Error fetching configuration, error was %s",
                     error.message);
         }