[rygel] tracker: TrackerCategory -> TrackerSearchContainer

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 7d16cd9f22b9f53fd73a3fb10ebccec6b441c985
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Thu Sep 17 18:51:53 2009 +0300

    tracker: TrackerCategory -> TrackerSearchContainer
    
    Rename TrackerCategory to TrackerSearchContainer.

 src/plugins/tracker/Makefile.am                    |    2 +-
 .../tracker/rygel-tracker-get-metadata-result.vala |   14 ++++----
 .../tracker/rygel-tracker-image-category.vala      |    2 +-
 src/plugins/tracker/rygel-tracker-image-item.vala  |    8 ++--
 src/plugins/tracker/rygel-tracker-item.vala        |   10 +++---
 .../tracker/rygel-tracker-music-category.vala      |    2 +-
 src/plugins/tracker/rygel-tracker-music-item.vala  |    8 ++--
 ...ry.vala => rygel-tracker-search-container.vala} |   30 ++++++++++----------
 .../tracker/rygel-tracker-search-result.vala       |   10 +++---
 .../tracker/rygel-tracker-video-category.vala      |    2 +-
 src/plugins/tracker/rygel-tracker-video-item.vala  |    8 ++--
 11 files changed, 48 insertions(+), 48 deletions(-)
---
diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index da83cb3..514c838 100644
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -13,7 +13,7 @@ librygel_media_tracker_la_SOURCES = \
 				    rygel-media-tracker.vala \
 				    rygel-tracker-root-container.vala \
 				    rygel-tracker-metadata-values.vala \
-				    rygel-tracker-category.vala \
+				    rygel-tracker-search-container.vala \
 				    rygel-tracker-video-category.vala \
 				    rygel-tracker-music-category.vala \
 				    rygel-tracker-image-category.vala \
diff --git a/src/plugins/tracker/rygel-tracker-get-metadata-result.vala b/src/plugins/tracker/rygel-tracker-get-metadata-result.vala
index 9301530..82ae448 100644
--- a/src/plugins/tracker/rygel-tracker-get-metadata-result.vala
+++ b/src/plugins/tracker/rygel-tracker-get-metadata-result.vala
@@ -28,10 +28,10 @@ public class Rygel.TrackerGetMetadataResult :
              Rygel.SimpleAsyncResult<MediaObject> {
     protected string item_id;
 
-    public TrackerGetMetadataResult (TrackerCategory    category,
-                                     AsyncReadyCallback callback,
-                                     string             item_id) {
-        base (category, callback);
+    public TrackerGetMetadataResult (TrackerSearchContainer search_container,
+                                     AsyncReadyCallback     callback,
+                                     string                 item_id) {
+        base (search_container, callback);
         this.item_id = item_id;
     }
 
@@ -43,10 +43,10 @@ public class Rygel.TrackerGetMetadataResult :
             return;
         }
 
-        TrackerCategory category = (TrackerCategory) this.source_object;
+        var search_container = (TrackerSearchContainer) this.source_object;
 
-        string path = category.get_item_path (item_id);
-        this.data = category.create_item (path, metadata);
+        string path = search_container.get_item_path (item_id);
+        this.data = search_container.create_item (path, metadata);
 
         this.complete ();
     }
diff --git a/src/plugins/tracker/rygel-tracker-image-category.vala b/src/plugins/tracker/rygel-tracker-image-category.vala
index 9b301c8..653ebb9 100644
--- a/src/plugins/tracker/rygel-tracker-image-category.vala
+++ b/src/plugins/tracker/rygel-tracker-image-category.vala
@@ -24,7 +24,7 @@
 /**
  * Represents Tracker Image category.
  */
-public class Rygel.TrackerImageCategory : Rygel.TrackerCategory {
+public class Rygel.TrackerImageCategory : Rygel.TrackerSearchContainer {
     public TrackerImageCategory (string         id,
                                  MediaContainer parent,
                                  string         title) {
diff --git a/src/plugins/tracker/rygel-tracker-image-item.vala b/src/plugins/tracker/rygel-tracker-image-item.vala
index 896ccc1..f4a6849 100644
--- a/src/plugins/tracker/rygel-tracker-image-item.vala
+++ b/src/plugins/tracker/rygel-tracker-image-item.vala
@@ -42,10 +42,10 @@ public class Rygel.TrackerImageItem : Rygel.TrackerItem {
         LAST_KEY
     }
 
-    public TrackerImageItem (string          id,
-                             string          path,
-                             TrackerCategory parent,
-                             string[]        metadata) {
+    public TrackerImageItem (string                 id,
+                             string                 path,
+                             TrackerSearchContainer parent,
+                             string[]               metadata) {
         base (id, path, parent, MediaItem.IMAGE_CLASS, metadata);
     }
 
diff --git a/src/plugins/tracker/rygel-tracker-item.vala b/src/plugins/tracker/rygel-tracker-item.vala
index 52969ba..418b41a 100644
--- a/src/plugins/tracker/rygel-tracker-item.vala
+++ b/src/plugins/tracker/rygel-tracker-item.vala
@@ -30,11 +30,11 @@ using DBus;
 public abstract class Rygel.TrackerItem : Rygel.MediaItem {
     protected string path;
 
-    public TrackerItem (string          id,
-                        string          path,
-                        TrackerCategory parent,
-                        string          upnp_class,
-                        string[]        metadata) {
+    public TrackerItem (string                 id,
+                        string                 path,
+                        TrackerSearchContainer parent,
+                        string                 upnp_class,
+                        string[]               metadata) {
         base (id, parent, "", upnp_class);
 
         this.path = path;
diff --git a/src/plugins/tracker/rygel-tracker-music-category.vala b/src/plugins/tracker/rygel-tracker-music-category.vala
index a71eb91..b9fb1df 100644
--- a/src/plugins/tracker/rygel-tracker-music-category.vala
+++ b/src/plugins/tracker/rygel-tracker-music-category.vala
@@ -24,7 +24,7 @@
 /**
  * Represents Tracker Music category.
  */
-public class Rygel.TrackerMusicCategory : Rygel.TrackerCategory {
+public class Rygel.TrackerMusicCategory : Rygel.TrackerSearchContainer {
     public TrackerMusicCategory (string         id,
                                  MediaContainer parent,
                                  string         title) {
diff --git a/src/plugins/tracker/rygel-tracker-music-item.vala b/src/plugins/tracker/rygel-tracker-music-item.vala
index 1c49ae4..3140771 100644
--- a/src/plugins/tracker/rygel-tracker-music-item.vala
+++ b/src/plugins/tracker/rygel-tracker-music-item.vala
@@ -43,10 +43,10 @@ public class Rygel.TrackerMusicItem : Rygel.TrackerItem {
         LAST_KEY
     }
 
-    public TrackerMusicItem (string          id,
-                             string          path,
-                             TrackerCategory parent,
-                             string[]        metadata) {
+    public TrackerMusicItem (string                 id,
+                             string                 path,
+                             TrackerSearchContainer parent,
+                             string[]               metadata) {
         base (id, path, parent, MediaItem.MUSIC_CLASS, metadata);
     }
 
diff --git a/src/plugins/tracker/rygel-tracker-category.vala b/src/plugins/tracker/rygel-tracker-search-container.vala
similarity index 87%
rename from src/plugins/tracker/rygel-tracker-category.vala
rename to src/plugins/tracker/rygel-tracker-search-container.vala
index 8334bf6..07f4717 100644
--- a/src/plugins/tracker/rygel-tracker-category.vala
+++ b/src/plugins/tracker/rygel-tracker-search-container.vala
@@ -26,9 +26,9 @@ using DBus;
 using Gee;
 
 /**
- * Represents Tracker category.
+ * A container listing a Tracker search result.
  */
-public abstract class Rygel.TrackerCategory : Rygel.MediaContainer {
+public abstract class Rygel.TrackerSearchContainer : Rygel.MediaContainer {
     /* class-wide constants */
     private const string TRACKER_SERVICE = "org.freedesktop.Tracker";
     private const string TRACKER_PATH = "/org/freedesktop/Tracker";
@@ -46,10 +46,10 @@ public abstract class Rygel.TrackerCategory : Rygel.MediaContainer {
 
     Gee.List<AsyncResult> results;
 
-    public TrackerCategory (string         id,
-                            MediaContainer parent,
-                            string         title,
-                            string         service) {
+    public TrackerSearchContainer (string         id,
+                                   MediaContainer parent,
+                                   string         title,
+                                   string         service) {
         base (id, parent, title, 0);
 
         this.service = service;
@@ -209,15 +209,15 @@ public abstract class Rygel.TrackerCategory : Rygel.MediaContainer {
     private void create_proxies () throws GLib.Error {
         DBus.Connection connection = DBus.Bus.get (DBus.BusType.SESSION);
 
-        this.metadata = connection.get_object (TrackerCategory.TRACKER_SERVICE,
-                                               TrackerCategory.METADATA_PATH,
-                                               TrackerCategory.METADATA_IFACE);
-        this.search = connection.get_object (TrackerCategory.TRACKER_SERVICE,
-                                             TrackerCategory.SEARCH_PATH,
-                                             TrackerCategory.SEARCH_IFACE);
-        this.tracker = connection.get_object (TrackerCategory.TRACKER_SERVICE,
-                                              TrackerCategory.TRACKER_PATH,
-                                              TrackerCategory.TRACKER_IFACE);
+        this.metadata = connection.get_object (TRACKER_SERVICE,
+                                               METADATA_PATH,
+                                               METADATA_IFACE);
+        this.search = connection.get_object (TRACKER_SERVICE,
+                                             SEARCH_PATH,
+                                             SEARCH_IFACE);
+        this.tracker = connection.get_object (TRACKER_SERVICE,
+                                              TRACKER_PATH,
+                                              TRACKER_IFACE);
     }
 
     private string? get_item_parent_id (string item_id) {
diff --git a/src/plugins/tracker/rygel-tracker-search-result.vala b/src/plugins/tracker/rygel-tracker-search-result.vala
index 3175102..b3fb66b 100644
--- a/src/plugins/tracker/rygel-tracker-search-result.vala
+++ b/src/plugins/tracker/rygel-tracker-search-result.vala
@@ -28,9 +28,9 @@ using Gee;
  */
 public class Rygel.TrackerSearchResult :
              Rygel.SimpleAsyncResult<Gee.List<MediaObject>> {
-    public TrackerSearchResult (TrackerCategory    category,
-                                AsyncReadyCallback callback) {
-        base (category, callback);
+    public TrackerSearchResult (TrackerSearchContainer search_container,
+                                AsyncReadyCallback     callback) {
+        base (search_container, callback);
 
         this.data = new ArrayList<MediaObject> ();
     }
@@ -43,14 +43,14 @@ public class Rygel.TrackerSearchResult :
             return;
         }
 
-        TrackerCategory category = (TrackerCategory) this.source_object;
+        var search_container = (TrackerSearchContainer) this.source_object;
 
         /* Iterate through all items */
         for (uint i = 0; i < search_result.length; i++) {
             string child_path = search_result[i][0];
             string[] metadata = this.slice_strv_tail (search_result[i], 2);
 
-            var item = category.create_item (child_path, metadata);
+            var item = search_container.create_item (child_path, metadata);
             this.data.add (item);
         }
 
diff --git a/src/plugins/tracker/rygel-tracker-video-category.vala b/src/plugins/tracker/rygel-tracker-video-category.vala
index e33cfd0..133de29 100644
--- a/src/plugins/tracker/rygel-tracker-video-category.vala
+++ b/src/plugins/tracker/rygel-tracker-video-category.vala
@@ -24,7 +24,7 @@
 /**
  * Represents Tracker Video category.
  */
-public class Rygel.TrackerVideoCategory : Rygel.TrackerCategory {
+public class Rygel.TrackerVideoCategory : Rygel.TrackerSearchContainer {
     public TrackerVideoCategory (string         id,
                                  MediaContainer parent,
                                  string         title) {
diff --git a/src/plugins/tracker/rygel-tracker-video-item.vala b/src/plugins/tracker/rygel-tracker-video-item.vala
index 9f7043e..f3b3d61 100644
--- a/src/plugins/tracker/rygel-tracker-video-item.vala
+++ b/src/plugins/tracker/rygel-tracker-video-item.vala
@@ -41,10 +41,10 @@ public class Rygel.TrackerVideoItem : Rygel.TrackerItem {
         LAST_KEY
     }
 
-    public TrackerVideoItem (string          id,
-                             string          path,
-                             TrackerCategory parent,
-                             string[]        metadata) {
+    public TrackerVideoItem (string                 id,
+                             string                 path,
+                             TrackerSearchContainer parent,
+                             string[]               metadata) {
         base (id, path, parent, MediaItem.VIDEO_CLASS, metadata);
     }