[rygel] core: Don't end the response when cancelled



commit 3d69c23462921c020b0101776e50ff9693fbce5e
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Fri May 14 15:45:33 2010 +0300

    core: Don't end the response when cancelled
    
    The base HTTPResponse class does that for us.

 src/rygel/rygel-seekable-response.vala |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/src/rygel/rygel-seekable-response.vala b/src/rygel/rygel-seekable-response.vala
index e16a9ab..faf612d 100644
--- a/src/rygel/rygel-seekable-response.vala
+++ b/src/rygel/rygel-seekable-response.vala
@@ -122,11 +122,6 @@ internal class Rygel.SeekableResponse : Rygel.HTTPResponse {
         this.msg.wrote_chunk.connect ((msg) => {
                 cb ();
         });
-        if (this.cancellable != null) {
-            this.cancellable.cancelled.connect (() => {
-                cb ();
-            });
-        }
 
         while (bytes_read > 0) {
             this.push_data (this.buffer, bytes_read);
@@ -154,7 +149,9 @@ internal class Rygel.SeekableResponse : Rygel.HTTPResponse {
                      err.message);
         }
 
-        this.end (false, Soup.KnownStatusCode.NONE);
+        if (this.cancellable == null || !this.cancellable.is_cancelled ()) {
+            this.end (false, Soup.KnownStatusCode.NONE);
+        }
     }
 
     private int get_requested_priority () {



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