[rygel] external: Don't corrupt container names



commit 6f557c866cd98d615a1494402e808458054f3a11
Author: Jens Georg <mail jensge org>
Date:   Wed Jan 1 15:25:14 2014 +0100

    external: Don't corrupt container names
    
    Looks like the code was overwriting the container's title in several places.
    
    Signed-off-by: Jens Georg <mail jensge org>
    
    https://bugzilla.gnome.org/show_bug.cgi?id=720671

 src/plugins/external/rygel-external-container.vala |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/plugins/external/rygel-external-container.vala 
b/src/plugins/external/rygel-external-container.vala
index fca762c..89bf94d 100644
--- a/src/plugins/external/rygel-external-container.vala
+++ b/src/plugins/external/rygel-external-container.vala
@@ -187,10 +187,10 @@ public class Rygel.External.Container : Rygel.MediaContainer,
                 var searchable = (bool) props.lookup ("Searchable");
                 props = yield props_iface.get_all (MediaObjectProxy.IFACE);
                 var path = (string) props.lookup ("Path");
-                title = get_mandatory_string_value (props,
-                                                    "DisplayName",
-                                                    path,
-                                                    this.service_name);
+                var title = get_mandatory_string_value (props,
+                                                        "DisplayName",
+                                                        path,
+                                                        this.service_name);
 
                 media_object = new Container (path,
                                               title,
@@ -256,10 +256,10 @@ public class Rygel.External.Container : Rygel.MediaContainer,
             }
 
             if (media_object == null) {
-                title = get_mandatory_string_value (props,
-                                                    "DisplayName",
-                                                    id,
-                                                    this.service_name);
+                var title = get_mandatory_string_value (props,
+                                                        "DisplayName",
+                                                        id,
+                                                        this.service_name);
 
                 if (type == "container") {
                     var child_count = (uint) props.lookup ("ChildCount");


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