[rygel] tracker: Don't use default parameters for arrays



commit 8ade721ee6e2fff152f93e42b71a59eada17e1df
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Mon Oct 5 18:01:53 2009 +0300

    tracker: Don't use default parameters for arrays
    
    This is a work-around for bug#597426.

 src/plugins/tracker/rygel-tracker-keywords.vala    |    1 -
 .../tracker/rygel-tracker-metadata-values.vala     |    1 +
 .../tracker/rygel-tracker-root-container.vala      |    9 ++++++---
 .../tracker/rygel-tracker-search-container.vala    |    5 +++--
 4 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/src/plugins/tracker/rygel-tracker-keywords.vala b/src/plugins/tracker/rygel-tracker-keywords.vala
index cd7b8ff..fce1012 100644
--- a/src/plugins/tracker/rygel-tracker-keywords.vala
+++ b/src/plugins/tracker/rygel-tracker-keywords.vala
@@ -74,7 +74,6 @@ 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 b7f3c09..9064459 100644
--- a/src/plugins/tracker/rygel-tracker-metadata-values.vala
+++ b/src/plugins/tracker/rygel-tracker-metadata-values.vala
@@ -101,6 +101,7 @@ 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 de7ac8e..fb97eaf 100644
--- a/src/plugins/tracker/rygel-tracker-root-container.vala
+++ b/src/plugins/tracker/rygel-tracker-root-container.vala
@@ -37,17 +37,20 @@ public class Rygel.TrackerRootContainer : Rygel.SimpleContainer {
                                         "16",
                                         this,
                                         "Pictures",
-                                        TrackerImageItem.SERVICE));
+                                        TrackerImageItem.SERVICE,
+                                        new string[0]));
         this.add_child (new TrackerSearchContainer (
                                         "14",
                                         this,
                                         "Music",
-                                        TrackerMusicItem.SERVICE));
+                                        TrackerMusicItem.SERVICE,
+                                        new string[0]));
         this.add_child (new TrackerSearchContainer (
                                         "15",
                                         this,
                                         "Videos",
-                                        TrackerVideoItem.SERVICE));
+                                        TrackerVideoItem.SERVICE,
+                                        new string[0]));
         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 f56bb50..b82ebde 100644
--- a/src/plugins/tracker/rygel-tracker-search-container.vala
+++ b/src/plugins/tracker/rygel-tracker-search-container.vala
@@ -54,10 +54,11 @@ public class Rygel.TrackerSearchContainer : Rygel.MediaContainer {
                                    MediaContainer parent,
                                    string         title,
                                    string         service,
-                                   string         query_condition = "",
-                                   string[]       keywords = new string[0]) {
+                                   string[]       keywords,
+                                   string         query_condition = "") {
         base (id, parent, title, 0);
 
+        this.keywords = keywords;
         this.service = service;
         this.keywords = keywords;
         this.query_condition = query_condition;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]