[rygel] Revert 3d45475..7679c0

[Jens Georg <jensgeorg src gnome org>]

commit 949840a8af18ef83a44b9deff3f51f0c8cf23e4b
Author: Jens Georg <mail jensge org>
Date:   Thu Jun 23 00:35:21 2011 +0200

    Revert 3d45475..7679c0
    
    Those commits had subtile issues that didn't show during my tests.

 src/plugins/tracker/Makefile.am                    |    2 -
 .../rygel-tracker-category-all-container.vala      |   25 +--
 .../tracker/rygel-tracker-query-helper.vala        |  253 --------------------
 .../tracker/rygel-tracker-search-query.vala        |  133 ----------
 4 files changed, 7 insertions(+), 406 deletions(-)
---
diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index 98017f5..90a396b 100644
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -22,7 +22,6 @@ librygel_tracker_la_SOURCES = \
 	rygel-tracker-category-all-container.vala \
 	rygel-tracker-key-chain-map.vala \
 	rygel-tracker-query.vala \
-	rygel-tracker-search-query.vala \
 	rygel-tracker-selection-query.vala \
 	rygel-tracker-deletion-query.vala \
 	rygel-tracker-insertion-query.vala \
@@ -33,7 +32,6 @@ librygel_tracker_la_SOURCES = \
 	rygel-tracker-bound-filter.vala \
 	rygel-tracker-regex-filter.vala \
 	rygel-tracker-boolean-filter.vala \
-	rygel-tracker-query-helper.vala \
 	rygel-tracker-item-factory.vala \
 	rygel-tracker-video-item-factory.vala \
 	rygel-tracker-music-item-factory.vala \
diff --git a/src/plugins/tracker/rygel-tracker-category-all-container.vala b/src/plugins/tracker/rygel-tracker-category-all-container.vala
index bdabd58..d848939 100644
--- a/src/plugins/tracker/rygel-tracker-category-all-container.vala
+++ b/src/plugins/tracker/rygel-tracker-category-all-container.vala
@@ -1,11 +1,9 @@
 /*
  * Copyright (C) 2008 Zeeshan Ali <zeenix gmail com>.
  * Copyright (C) 2008-2010 Nokia Corporation.
- * Copyright (C) 2010 MediaNet Inh.
  *
- * Authors: Zeeshan Ali (Khattak) <zeeshanak gnome org>
- *                                <zeeshan ali nokia com>
- *          Sunil Mohan Adapa <sunil medhas org>
+ * Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
+ *                               <zeeshan ali nokia com>
  *
  * This file is part of Rygel.
  *
@@ -39,14 +37,11 @@ public class Rygel.Tracker.CategoryAllContainer : SearchContainer,
     public ArrayList<string> create_classes { get; set; }
     public ArrayList<string> search_classes { get; set; }
 
-    private QueryHelper query_helper;
     private ResourcesIface resources;
 
     public CategoryAllContainer (CategoryContainer parent) {
         base ("All" + parent.id, parent, "All", parent.item_factory);
 
-        this.query_helper = new QueryHelper (this);
-
         this.create_classes = new ArrayList<string> ();
         this.create_classes.add (item_factory.upnp_class);
         this.search_classes = new ArrayList<string> ();
@@ -104,17 +99,11 @@ public class Rygel.Tracker.CategoryAllContainer : SearchContainer,
                                        out uint          total_matches,
                                        Cancellable?      cancellable)
                                        throws Error {
-        var query = this.query_helper.create_query (expression,
-                                                    null,
-                                                    offset,
-                                                    max_count,
-                                                    cancellable);
-
-        yield query.execute (this.resources);
-
-        total_matches = yield query.get_count (this.resources);
-
-        return this.query_helper.get_results (query);
+        return yield this.simple_search (expression,
+                                         offset,
+                                         max_count,
+                                         out total_matches,
+                                         cancellable);
     }
 
     private void on_graph_updated (DBusConnection connection,