diff options
| author | Carlos Garnacho <carlos@lanedo.com> | 2011-10-06 14:58:27 +0200 |
|---|---|---|
| committer | Martyn Russell <martyn@lanedo.com> | 2011-10-06 18:45:54 +0100 |
| commit | 886722ba3abf8a8251b2a33a024147da64caef08 (patch) | |
| tree | 6bf419b200e41d19481e0abbea3e5a85a792a135 | |
| parent | 748bdd97f6dce67c10ac02bd26e7df810ab204a0 (diff) | |
| download | tracker-886722ba3abf8a8251b2a33a024147da64caef08.tar.gz | |
tracker-needle: Fix some valac compiler warnings
| -rw-r--r-- | src/tracker-needle/tracker-result-store.vala | 11 | ||||
| -rw-r--r-- | src/tracker-needle/tracker-tags-view.vala | 5 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/tracker-needle/tracker-result-store.vala b/src/tracker-needle/tracker-result-store.vala index 5478438c8..e5cd53c67 100644 --- a/src/tracker-needle/tracker-result-store.vala +++ b/src/tracker-needle/tracker-result-store.vala @@ -414,6 +414,8 @@ public class Tracker.ResultStore : Gtk.TreeModel, GLib.Object { CategoryNode cat; int i = 0; + iter = TreeIter (); + if (queries.length > 1) { if (indices[i] >= categories.length) { iter.stamp = 0; @@ -541,12 +543,13 @@ public class Tracker.ResultStore : Gtk.TreeModel, GLib.Object { public void get_value (Gtk.TreeIter iter, int column, out GLib.Value value) { CategoryNode cat; + value = GLib.Value (this.get_column_type (column)); + if (column >= n_columns + n_extra_columns) { return; } cat = (CategoryNode) iter.user_data; - value.init (this.get_column_type (column)); if (column == n_columns + 1) { // Type column @@ -623,6 +626,8 @@ public class Tracker.ResultStore : Gtk.TreeModel, GLib.Object { public bool iter_children (out Gtk.TreeIter iter, Gtk.TreeIter? parent) { CategoryNode cat; + iter = TreeIter (); + if (parent == null) { if (categories.length == 0) { iter.stamp = 0; @@ -734,6 +739,8 @@ public class Tracker.ResultStore : Gtk.TreeModel, GLib.Object { public bool iter_nth_child (out Gtk.TreeIter iter, Gtk.TreeIter? parent, int n) { CategoryNode cat; + iter = TreeIter (); + if (parent != null) { cat = (CategoryNode) parent.user_data; @@ -775,6 +782,8 @@ public class Tracker.ResultStore : Gtk.TreeModel, GLib.Object { } public bool iter_parent (out Gtk.TreeIter iter, Gtk.TreeIter child) { + iter = TreeIter (); + if (queries.length > 1 && child.user_data2 != null) { // child within a category diff --git a/src/tracker-needle/tracker-tags-view.vala b/src/tracker-needle/tracker-tags-view.vala index be23a6521..dccc0d3b1 100644 --- a/src/tracker-needle/tracker-tags-view.vala +++ b/src/tracker-needle/tracker-tags-view.vala @@ -430,12 +430,15 @@ public class TrackerTagsView : VBox { } private bool find_tag (string tag, out TreeIter iter) { + TreeIter found_iter = { 0 }; + + iter = found_iter; + if (tag == null || tag == "") { return false; } TreeModel model = view.get_model (); - TreeIter found_iter = { 0 }; bool found = false; model.foreach ((model, path, foreach_iter) => { |