[rygel] media-export: Really set proper UPnP class



commit 09e5bc9dcd1c6e9bff9f79eb9e2a0d0d68315691
Author: Jens Georg <mail jensge org>
Date:   Sun Mar 18 18:09:00 2012 +0100

    media-export: Really set proper UPnP class
    
    Commit baa6f4c4 used a wrong asumption so the class was still
    .storageFolder instead of .musicAlbum.

 ...rygel-media-export-query-container-factory.vala |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/src/plugins/media-export/rygel-media-export-query-container-factory.vala b/src/plugins/media-export/rygel-media-export-query-container-factory.vala
index d78bb19..c101f7b 100644
--- a/src/plugins/media-export/rygel-media-export-query-container-factory.vala
+++ b/src/plugins/media-export/rygel-media-export-query-container-factory.vala
@@ -164,9 +164,7 @@ internal class Rygel.MediaExport.QueryContainerFactory : Object {
      * @param description The plaintext container description
      * @param pattern     Contains the pattern used for child containers if
      *                    descrption is for a node container, null otherwise.
-     * @param attribute   Contains the UPnP attribute the container describes
-     *                    if description is for a node container, null
-     *                    otherwise.
+     * @param attribute   Contains the UPnP attribute the container describes.
      * @param name        If passed empty, name will be generated from the
      *                    description.
      * @return A SearchExpression corresponding to the non-variable part of
@@ -183,14 +181,14 @@ internal class Rygel.MediaExport.QueryContainerFactory : Object {
 
         int i = 0;
         while (i < args.length) {
+            attribute = args[i].replace (QueryContainer.PREFIX, "");
+            attribute = Uri.unescape_string (attribute);
             if (args[i + 1] != "?") {
                 this.update_search_expression (ref expression,
                                                args[i],
                                                args[i + 1]);
             } else {
                 args[i + 1] = "%s";
-                attribute = args[i].replace (QueryContainer.PREFIX, "");
-                attribute = Uri.unescape_string (attribute);
                 pattern = string.joinv (",", args);
 
                 if (name == "" && i > 0) {



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