rygel r687 - trunk/src/rygel

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Sun Mar 15 19:03:32 2009
New Revision: 687
URL: http://svn.gnome.org/viewvc/rygel?rev=687&view=rev

Log:
HTTPRequest keeps a unowned ref to HTTPServer.

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

Modified: trunk/src/rygel/rygel-http-request.vala
==============================================================================
--- trunk/src/rygel/rygel-http-request.vala	(original)
+++ trunk/src/rygel/rygel-http-request.vala	Sun Mar 15 19:03:32 2009
@@ -38,6 +38,7 @@
  * Responsible for handling HTTP client requests.
  */
 internal class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine {
+    private unowned HTTPServer http_server;
     private MediaContainer root_container;
     private Soup.Server server;
     private Soup.Message msg;
@@ -52,11 +53,12 @@
 
     private Cancellable cancellable;
 
-    public HTTPRequest (MediaContainer            root_container,
+    public HTTPRequest (HTTPServer                http_server,
                         Soup.Server               server,
                         Soup.Message              msg,
                         HashTable<string,string>? query) {
-        this.root_container = root_container;
+        this.http_server = http_server;
+        this.root_container = http_server.root_container;
         this.server = server;
         this.msg = msg;
         this.query = query;

Modified: trunk/src/rygel/rygel-http-server.vala
==============================================================================
--- trunk/src/rygel/rygel-http-server.vala	(original)
+++ trunk/src/rygel/rygel-http-server.vala	Sun Mar 15 19:03:32 2009
@@ -31,7 +31,7 @@
     private string path_root;
 
     // Reference to root container of associated ContentDirectory
-    private MediaContainer root_container;
+    public MediaContainer root_container;
     private GUPnP.Context context;
     private ArrayList<HTTPRequest> requests;
 
@@ -135,7 +135,7 @@
                msg.method,
                msg.get_uri ().to_string (false));
 
-        var request = new HTTPRequest (this.root_container, server, msg, query);
+        var request = new HTTPRequest (this, server, msg, query);
 
         request.completed += this.on_request_completed;
         this.requests.add (request);