From bc31ab78b29fbdf944817fe33c2eaec2176748b0 Mon Sep 17 00:00:00 2001
From: "Zeeshan Ali (Khattak)" <zeeshanak@gnome.org>
Date: Mon, 5 Oct 2009 19:06:38 +0300
Subject: [PATCH] Revert "tracker: Don't use default parameters for arrays"

This reverts commit 8ade721ee6e2fff152f93e42b71a59eada17e1df.
---
 src/plugins/tracker/rygel-tracker-keywords.vala         | 1 +
 src/plugins/tracker/rygel-tracker-metadata-values.vala  | 1 -
 src/plugins/tracker/rygel-tracker-root-container.vala   | 9 +++------
 src/plugins/tracker/rygel-tracker-search-container.vala | 5 ++---
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/plugins/tracker/rygel-tracker-keywords.vala b/src/plugins/tracker/rygel-tracker-keywords.vala
index fce1012..cd7b8ff 100644
--- a/src/plugins/tracker/rygel-tracker-keywords.vala
+++ b/src/plugins/tracker/rygel-tracker-keywords.vala
@@ -74,6 +74,7 @@ public class Rygel.TrackerKeywords : Rygel.SimpleContainer {
                                                         this,
                                                         keyword,
                                                         SERVICE,
+                                                        "",
                                                         keywords);
 
             this.add_child (container);
diff --git a/src/plugins/tracker/rygel-tracker-metadata-values.vala b/src/plugins/tracker/rygel-tracker-metadata-values.vala
index 9064459..b7f3c09 100644
--- a/src/plugins/tracker/rygel-tracker-metadata-values.vala
+++ b/src/plugins/tracker/rygel-tracker-metadata-values.vala
@@ -101,7 +101,6 @@ public class Rygel.TrackerMetadataValues : Rygel.SimpleContainer {
                                                         this,
                                                         value,
                                                         SERVICE,
-                                                        new string[0],
                                                         query_condition);
 
             this.add_child (container);
diff --git a/src/plugins/tracker/rygel-tracker-root-container.vala b/src/plugins/tracker/rygel-tracker-root-container.vala
index fb97eaf..de7ac8e 100644
--- a/src/plugins/tracker/rygel-tracker-root-container.vala
+++ b/src/plugins/tracker/rygel-tracker-root-container.vala
@@ -37,20 +37,17 @@ public class Rygel.TrackerRootContainer : Rygel.SimpleContainer {
                                         "16",
                                         this,
                                         "Pictures",
-                                        TrackerImageItem.SERVICE,
-                                        new string[0]));
+                                        TrackerImageItem.SERVICE));
         this.add_child (new TrackerSearchContainer (
                                         "14",
                                         this,
                                         "Music",
-                                        TrackerMusicItem.SERVICE,
-                                        new string[0]));
+                                        TrackerMusicItem.SERVICE));
         this.add_child (new TrackerSearchContainer (
                                         "15",
                                         this,
                                         "Videos",
-                                        TrackerVideoItem.SERVICE,
-                                        new string[0]));
+                                        TrackerVideoItem.SERVICE));
         this.add_child (new TrackerMetadataValues ("Audio:Artist",
                                                    "17",
                                                    this,
diff --git a/src/plugins/tracker/rygel-tracker-search-container.vala b/src/plugins/tracker/rygel-tracker-search-container.vala
index b82ebde..f56bb50 100644
--- a/src/plugins/tracker/rygel-tracker-search-container.vala
+++ b/src/plugins/tracker/rygel-tracker-search-container.vala
@@ -54,11 +54,10 @@ public class Rygel.TrackerSearchContainer : Rygel.MediaContainer {
                                    MediaContainer parent,
                                    string         title,
                                    string         service,
-                                   string[]       keywords,
-                                   string         query_condition = "") {
+                                   string         query_condition = "",
+                                   string[]       keywords = new string[0]) {
         base (id, parent, title, 0);
 
-        this.keywords = keywords;
         this.service = service;
         this.keywords = keywords;
         this.query_condition = query_condition;
-- 
2.7.4