Rename 'service_path' to 'service_name'

diff --git a/src/plugins/external/rygel-external-container.vala b/src/plugins/external/rygel-external-container.vala
index 3bbd441..cba68ee 100644 (file)
--- a/src/plugins/external/rygel-external-container.vala
+++ b/src/plugins/external/rygel-external-container.vala
@@ -39,18 +39,18 @@ public class Rygel.ExternalContainer : MediaContainer {
 
     public dynamic DBus.Object actual_container;
 
-    private string service_path;
+    private string service_name;
     private string object_path;
 
     private ArrayList<MediaObject> media_objects;
 
     public ExternalContainer (string             id,
-                              string             service_path,
+                              string             service_name,
                               string             object_path,
                               ExternalContainer? parent) {
         base (id, parent, "Uknown", 0);
 
-        this.service_path = service_path;
+        this.service_name = service_name;
         this.object_path = object_path;
 
         this.media_objects = new ArrayList<MediaObject> ();
@@ -59,7 +59,7 @@ public class Rygel.ExternalContainer : MediaContainer {
             DBus.Connection connection = DBus.Bus.get (DBus.BusType.SESSION);
 
             // Create proxy to MediaObject iface to get the display name through
-            dynamic DBus.Object props = connection.get_object (service_path,
+            dynamic DBus.Object props = connection.get_object (service_name,
                                                                object_path,
                                                                PROPS_IFACE);
             Value value;
@@ -67,7 +67,7 @@ public class Rygel.ExternalContainer : MediaContainer {
             this.title = value.get_string ();
 
             // Now proxy to MediaContainer iface for the rest of the stuff
-            this.actual_container = connection.get_object (service_path,
+            this.actual_container = connection.get_object (service_name,
                                                            object_path,
                                                            CONTAINER_IFACE);
 
@@ -145,14 +145,14 @@ public class Rygel.ExternalContainer : MediaContainer {
         object_paths = this.actual_container.GetContainers ();
         foreach (var object_path in object_paths) {
             this.media_objects.add (new ExternalContainer (object_path,
-                                                           this.service_path,
+                                                           this.service_name,
                                                            object_path,
                                                            this));
         }
 
         object_paths = this.actual_container.GetItems ();
         foreach (var object_path in object_paths) {
-            this.media_objects.add (new ExternalItem (this.service_path,
+            this.media_objects.add (new ExternalItem (this.service_name,
                                                       object_path,
                                                       this));
         }

diff --git a/src/plugins/external/rygel-external-item.vala b/src/plugins/external/rygel-external-item.vala
index b478928..5b1329b 100644 (file)
--- a/src/plugins/external/rygel-external-item.vala
+++ b/src/plugins/external/rygel-external-item.vala
@@ -34,7 +34,7 @@ public class Rygel.ExternalItem : MediaItem {
     private static string OBJECT_IFACE = "org.Rygel.MediaObject1";
     private static string ITEM_IFACE = "org.Rygel.MediaItem1";
 
-    public ExternalItem (string         service_path,
+    public ExternalItem (string         service_name,
                          string         object_path,
                          MediaContainer parent)
                          throws GLib.Error {
@@ -45,7 +45,7 @@ public class Rygel.ExternalItem : MediaItem {
 
         DBus.Connection connection = DBus.Bus.get (DBus.BusType.SESSION);
 
-        dynamic DBus.Object props = connection.get_object (service_path,
+        dynamic DBus.Object props = connection.get_object (service_name,
                                                            object_path,
                                                            PROPS_IFACE);