rygel r608 - trunk/src/rygel

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Mon Feb 16 17:33:07 2009
New Revision: 608
URL: http://svn.gnome.org/viewvc/rygel?rev=608&view=rev

Log:
ContentDir keeps a system_update_id.

This id is no longer the same as update_id of the root_container.

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

Modified: trunk/src/rygel/rygel-browse.vala
==============================================================================
--- trunk/src/rygel/rygel-browse.vala	(original)
+++ trunk/src/rygel/rygel-browse.vala	Mon Feb 16 17:33:07 2009
@@ -50,6 +50,7 @@
     private MediaObject media_object;
 
     private MediaContainer root_container;
+    private uint32 system_update_id;
     private ServiceAction action;
     private Rygel.DIDLLiteWriter didl_writer;
 
@@ -59,6 +60,7 @@
     public Browse (ContentDirectory    content_dir,
                    owned ServiceAction action) {
         this.root_container = content_dir.root_container;
+        this.system_update_id = content_dir.system_update_id;
         this.action = (owned) action;
 
         this.didl_writer =
@@ -204,7 +206,7 @@
         string didl = this.didl_writer.get_string ();
 
         if (this.update_id == uint32.MAX) {
-            this.update_id = this.root_container.update_id;
+            this.update_id = this.system_update_id;
         }
 
         /* Set action return arguments */

Modified: trunk/src/rygel/rygel-content-directory.vala
==============================================================================
--- trunk/src/rygel/rygel-content-directory.vala	(original)
+++ trunk/src/rygel/rygel-content-directory.vala	Mon Feb 16 17:33:07 2009
@@ -53,6 +53,7 @@
     public MediaContainer root_container;
 
     private ArrayList<Browse> browses;
+    public uint32 system_update_id;
 
     // Public abstract methods derived classes need to implement
     public virtual MediaContainer? create_root_container () {
@@ -118,7 +119,7 @@
     private void get_system_update_id_cb (ContentDirectory    content_dir,
                                           owned ServiceAction action) {
         /* Set action return arguments */
-        action.set ("Id", typeof (uint32), this.root_container.update_id);
+        action.set ("Id", typeof (uint32), this.system_update_id);
 
         action.return ();
     }
@@ -129,7 +130,7 @@
                                          ref GLib.Value   value) {
         /* Set action return arguments */
         value.init (typeof (uint32));
-        value.set_uint (this.root_container.update_id);
+        value.set_uint (this.system_update_id);
     }
 
     /* action GetSearchCapabilities implementation */