From 43260666e6f2d85afff2406a4f6df02f2b929793 Mon Sep 17 00:00:00 2001
From: "Zeeshan Ali (Khattak)" <zeeshanak@src.gnome.org>
Date: Sun, 15 Mar 2009 19:03:32 +0000
Subject: [PATCH] HTTPRequest keeps a unowned ref to HTTPServer.

svn path=/trunk/; revision=687
---
 src/rygel/rygel-http-request.vala | 6 ++++--
 src/rygel/rygel-http-server.vala  | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/rygel/rygel-http-request.vala b/src/rygel/rygel-http-request.vala
index 5863653..b72c027 100644
--- a/src/rygel/rygel-http-request.vala
+++ b/src/rygel/rygel-http-request.vala
@@ -38,6 +38,7 @@ internal errordomain Rygel.HTTPRequestError {
  * 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 @@ internal class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine {
 
     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;
diff --git a/src/rygel/rygel-http-server.vala b/src/rygel/rygel-http-server.vala
index c7e5bfc..ab7d564 100644
--- a/src/rygel/rygel-http-server.vala
+++ b/src/rygel/rygel-http-server.vala
@@ -31,7 +31,7 @@ public class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine {
     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 @@ public class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine {
                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);
-- 
2.7.4