rygel r621 - trunk/src/rygel

[zeeshanak svn gnome org]

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

Log:
Browse just forwards the Cancellable to async calls.

Modified:
   trunk/src/rygel/rygel-browse.vala

Modified: trunk/src/rygel/rygel-browse.vala
==============================================================================
--- trunk/src/rygel/rygel-browse.vala	(original)
+++ trunk/src/rygel/rygel-browse.vala	Thu Feb 19 17:17:27 2009
@@ -68,10 +68,7 @@
     }
 
     public void run (Cancellable? cancellable) {
-        if (cancellable != null) {
-            this.cancellable = cancellable;
-            cancellable.cancelled += this.on_cancelled;
-        }
+        this.cancellable = cancellable;
 
         /* Start DIDL-Lite fragment */
         this.didl_writer.start_didl_lite (null, null, true);
@@ -80,10 +77,6 @@
         this.parse_args ();
     }
 
-    private void on_cancelled (Cancellable cancellable) {
-        // FIXME: implement canceling of browse request here
-    }
-
     private void got_media_object () {
         if (this.media_object == null) {
             this.handle_error (
@@ -109,7 +102,7 @@
         }
 
         this.root_container.find_object (this.object_id,
-                                         null,
+                                         this.cancellable,
                                          this.on_media_object_found);
     }
 
@@ -268,10 +261,10 @@
     private void fetch_children () {
         var container = (MediaContainer) this.media_object;
 
-         container.get_children (this.index,
-                                 this.requested_count,
-                                 null,
-                                 this.on_children_fetched);
+        container.get_children (this.index,
+                                this.requested_count,
+                                this.cancellable,
+                                this.on_children_fetched);
     }
 
     private void on_children_fetched (Object      source_object,