rygel r623 - trunk/src/rygel

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Thu Feb 19 17:17:36 2009
New Revision: 623
URL: http://svn.gnome.org/viewvc/rygel?rev=623&view=rev

Log:
Small refactoring.

Modified:
   trunk/src/rygel/rygel-http-request.vala

Modified: trunk/src/rygel/rygel-http-request.vala
==============================================================================
--- trunk/src/rygel/rygel-http-request.vala	(original)
+++ trunk/src/rygel/rygel-http-request.vala	Thu Feb 19 17:17:36 2009
@@ -132,10 +132,12 @@
             return;
         }
 
+        string uri = this.item.uri;
+
         if (this.item.size > 0) {
-            this.handle_interactive_item ();
+            this.handle_interactive_item (uri);
         } else {
-            this.handle_streaming_item ();
+            this.handle_streaming_item (uri);
         }
     }
 
@@ -172,8 +174,7 @@
         }
     }
 
-    private void handle_streaming_item () {
-        string uri = this.item.uri;
+    private void handle_streaming_item (string? uri) {
         dynamic Element src = null;
 
         if (uri != null) {
@@ -202,9 +203,7 @@
         }
     }
 
-    private void handle_interactive_item () {
-        string uri = this.item.uri;
-
+    private void handle_interactive_item (string? uri) {
         if (uri == null) {
             var error = new HTTPRequestError.NOT_FOUND (
                                 "Requested item '%s' didn't provide a URI\n",