[rygel] core: Rename ItemUri to HTTPItemURI



commit 6cdfd2223bee51631814944c7f94b3a9dadf1e9e
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Mon Dec 28 18:03:46 2009 +0200

    core: Rename ItemUri to HTTPItemURI

 src/rygel/Makefile.am                              |    2 +-
 ...ygel-item-uri.vala => rygel-http-item-uri.vala} |   10 +++++-----
 src/rygel/rygel-http-request.vala                  |    4 ++--
 src/rygel/rygel-http-server.vala                   |    2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index 8b21a06..335cfaf 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -36,7 +36,7 @@ BUILT_SOURCES = rygel-1.0.vapi \
 		rygel.h
 
 rygel_SOURCES = $(VAPI_SOURCE_FILES) \
-		rygel-item-uri.vala \
+		rygel-http-item-uri.vala \
 		rygel-dbus-service.vala \
 		rygel-root-device.vala \
 		rygel-root-device-factory.vala \
diff --git a/src/rygel/rygel-item-uri.vala b/src/rygel/rygel-http-item-uri.vala
similarity index 92%
rename from src/rygel/rygel-item-uri.vala
rename to src/rygel/rygel-http-item-uri.vala
index 70e88bf..245e22f 100644
--- a/src/rygel/rygel-item-uri.vala
+++ b/src/rygel/rygel-http-item-uri.vala
@@ -20,20 +20,20 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-internal class Rygel.ItemUri : Object {
+internal class Rygel.HTTPItemURI : Object {
     public string item_id;
     public int thumbnail_index;
     public string? transcode_target;
 
-    public ItemUri (string item_id,
-                    int thumbnail_index = -1,
-                    string ? transcode_target = null) {
+    public HTTPItemURI (string item_id,
+                        int thumbnail_index = -1,
+                        string ? transcode_target = null) {
         this.item_id = item_id;
         this.thumbnail_index = thumbnail_index;
         this.transcode_target = transcode_target;
     }
 
-    public ItemUri.from_string (string uri, string server_root = "") {
+    public HTTPItemURI.from_string (string uri, string server_root = "") {
         // do not decode the path here as it may contain encoded slashes
         this.thumbnail_index = -1;
         this.transcode_target = null;
diff --git a/src/rygel/rygel-http-request.vala b/src/rygel/rygel-http-request.vala
index c5f7a0c..b4e91a8 100644
--- a/src/rygel/rygel-http-request.vala
+++ b/src/rygel/rygel-http-request.vala
@@ -81,8 +81,8 @@ internal class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine {
         }
 
         try {
-            var uri = new ItemUri.from_string (this.msg.uri.path,
-                                               this.http_server.path_root);
+            var uri = new HTTPItemURI.from_string (this.msg.uri.path,
+                                                   this.http_server.path_root);
 
             this.item_id = uri.item_id;
             this.thumbnail_index = uri.thumbnail_index;
diff --git a/src/rygel/rygel-http-server.vala b/src/rygel/rygel-http-server.vala
index a41476d..3b7a5ea 100644
--- a/src/rygel/rygel-http-server.vala
+++ b/src/rygel/rygel-http-server.vala
@@ -129,7 +129,7 @@ internal class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine {
                                                   string?   transcode_target,
                                                   out string protocol) {
 
-        var uri = new ItemUri (item.id, thumbnail_index, transcode_target);
+        var uri = new HTTPItemURI (item.id, thumbnail_index, transcode_target);
 
         protocol = "http-get";
 



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