rygel r284 - in trunk: . src/media-providers/tracker

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Tue Nov 11 17:41:58 2008
New Revision: 284
URL: http://svn.gnome.org/viewvc/rygel?rev=284&view=rev

Log:
Rename field/variable "tracker_category" to "category".

Modified:
   trunk/ChangeLog
   trunk/src/media-providers/tracker/rygel-media-tracker.vala
   trunk/src/media-providers/tracker/rygel-tracker-container.vala
   trunk/src/media-providers/tracker/rygel-tracker-image-item.vala
   trunk/src/media-providers/tracker/rygel-tracker-music-item.vala
   trunk/src/media-providers/tracker/rygel-tracker-video-item.vala

Modified: trunk/src/media-providers/tracker/rygel-media-tracker.vala
==============================================================================
--- trunk/src/media-providers/tracker/rygel-media-tracker.vala	(original)
+++ trunk/src/media-providers/tracker/rygel-media-tracker.vala	Tue Nov 11 17:41:58 2008
@@ -202,7 +202,7 @@
         }
 
         foreach (TrackerContainer tmp in this.containers) {
-            if (tmp.tracker_category == category) {
+            if (tmp.category == category) {
                 container = tmp;
 
                 break;

Modified: trunk/src/media-providers/tracker/rygel-tracker-container.vala
==============================================================================
--- trunk/src/media-providers/tracker/rygel-tracker-container.vala	(original)
+++ trunk/src/media-providers/tracker/rygel-tracker-container.vala	Tue Nov 11 17:41:58 2008
@@ -40,7 +40,7 @@
     private static dynamic DBus.Object tracker;
 
     private Context context;
-    public string tracker_category;
+    public string category;
 
     /* UPnP class of items under this container */
     public string child_class;
@@ -76,14 +76,14 @@
                              string  parent_id,
                              string  root_id,
                              string  title,
-                             string  tracker_category,
+                             string  category,
                              string  child_class,
                              Context context) {
         this.id = id;
         this.parent_id = parent_id;
         this.root_id = root_id;
         this.title = title;
-        this.tracker_category = tracker_category;
+        this.category = category;
         this.child_class = child_class;
         this.context = context;
     }
@@ -108,7 +108,7 @@
 
         uint count = 0;
         for (uint i = 0; i < stats.length; i++) {
-            if (stats[i][0] == this.tracker_category)
+            if (stats[i][0] == this.category)
                 count = stats[i][1].to_int ();
         }
 
@@ -144,7 +144,7 @@
         try {
             children =
                 TrackerContainer.files.GetByServiceType (0,
-                                                         this.tracker_category,
+                                                         this.category,
                                                          (int) offset,
                                                          (int) max_count);
         } catch (GLib.Error error) {
@@ -201,7 +201,7 @@
 
         /* TODO: make this async */
         try {
-            values = TrackerContainer.metadata.Get (this.tracker_category,
+            values = TrackerContainer.metadata.Get (this.category,
                                                     path,
                                                     keys);
         } catch (GLib.Error error) {

Modified: trunk/src/media-providers/tracker/rygel-tracker-image-item.vala
==============================================================================
--- trunk/src/media-providers/tracker/rygel-tracker-image-item.vala	(original)
+++ trunk/src/media-providers/tracker/rygel-tracker-image-item.vala	Tue Nov 11 17:41:58 2008
@@ -51,7 +51,7 @@
 
         /* TODO: make this async */
         try {
-            values = this.metadata.Get (parent.tracker_category, path, keys);
+            values = this.metadata.Get (parent.category, path, keys);
         } catch (GLib.Error error) {
             critical ("failed to get metadata for %s: %s\n",
                       path,

Modified: trunk/src/media-providers/tracker/rygel-tracker-music-item.vala
==============================================================================
--- trunk/src/media-providers/tracker/rygel-tracker-music-item.vala	(original)
+++ trunk/src/media-providers/tracker/rygel-tracker-music-item.vala	Tue Nov 11 17:41:58 2008
@@ -51,7 +51,7 @@
 
         /* TODO: make this async */
         try {
-            values = this.metadata.Get (parent.tracker_category, path, keys);
+            values = this.metadata.Get (parent.category, path, keys);
         } catch (GLib.Error error) {
             critical ("failed to get metadata for %s: %s\n",
                       path,

Modified: trunk/src/media-providers/tracker/rygel-tracker-video-item.vala
==============================================================================
--- trunk/src/media-providers/tracker/rygel-tracker-video-item.vala	(original)
+++ trunk/src/media-providers/tracker/rygel-tracker-video-item.vala	Tue Nov 11 17:41:58 2008
@@ -49,7 +49,7 @@
 
         /* TODO: make this async */
         try {
-            values = this.metadata.Get (parent.tracker_category, path, keys);
+            values = this.metadata.Get (parent.category, path, keys);
         } catch (GLib.Error error) {
             critical ("failed to get metadata for %s: %s\n",
                       path,