[rygel] Revert "tracker: Get rid of SearchContainer().filter"
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [rygel] Revert "tracker: Get rid of SearchContainer().filter"
- Date: Sat, 5 Dec 2009 01:22:04 +0000 (UTC)
commit ece43c001a86924ebb9a7660ffe8bcbab06250eb
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Thu Dec 3 15:43:35 2009 +0200
Revert "tracker: Get rid of SearchContainer().filter"
This reverts commit 626ba91d3bd570007bdb3dd54ed11d593b4a1f09.
Conflicts:
src/plugins/tracker/rygel-tracker-search-container.vala
.../tracker/rygel-tracker-metadata-values.vala | 3 ++-
.../tracker/rygel-tracker-search-container.vala | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/plugins/tracker/rygel-tracker-metadata-values.vala b/src/plugins/tracker/rygel-tracker-metadata-values.vala
index 093de97..5c1de92 100644
--- a/src/plugins/tracker/rygel-tracker-metadata-values.vala
+++ b/src/plugins/tracker/rygel-tracker-metadata-values.vala
@@ -137,7 +137,8 @@ public class Rygel.TrackerMetadataValues : Rygel.SimpleContainer {
this,
value,
this.item_factory,
- child_mandatory);
+ child_mandatory,
+ null);
this.add_child (container);
}
diff --git a/src/plugins/tracker/rygel-tracker-search-container.vala b/src/plugins/tracker/rygel-tracker-search-container.vala
index fd7b9b0..6ba060e 100644
--- a/src/plugins/tracker/rygel-tracker-search-container.vala
+++ b/src/plugins/tracker/rygel-tracker-search-container.vala
@@ -46,7 +46,8 @@ public class Rygel.TrackerSearchContainer : Rygel.MediaContainer {
MediaContainer parent,
string title,
TrackerItemFactory item_factory,
- TrackerQueryTriplets? mandatory = null) {
+ TrackerQueryTriplets? mandatory = null,
+ ArrayList<string>? filters = null) {
base (id, parent, title, 0);
this.item_factory = item_factory;
@@ -85,7 +86,7 @@ public class Rygel.TrackerSearchContainer : Rygel.MediaContainer {
this.query = new TrackerQuery (variables,
our_mandatory,
optional,
- null,
+ filters,
MODIFIED_VARIABLE);
try {
@@ -191,7 +192,7 @@ public class Rygel.TrackerSearchContainer : Rygel.MediaContainer {
if (rel_expression.operand1 == "@id") {
var filter = create_filter_for_id (rel_expression);
if (filter != null) {
- query.filters.add (filter);
+ query.filters.insert (0, filter);
} else {
return null;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]