[tracker/tracker-1.4: 1/4] tracker-needle: ambigious references



commit 25aedbefbf49f4ace1fef8540be668b9ad27137a
Author: Kunaal <kunaalus gmail com>
Date:   Mon Mar 23 21:04:13 2015 +0530

    tracker-needle: ambigious references
    
    Glib now has a new class Glib.ListStore, which creates a conflict in Vala.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=746194

 src/tracker-needle/tracker-needle.vala    |    2 +-
 src/tracker-needle/tracker-tags-view.vala |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/tracker-needle/tracker-needle.vala b/src/tracker-needle/tracker-needle.vala
index df72423..79eb846 100644
--- a/src/tracker-needle/tracker-needle.vala
+++ b/src/tracker-needle/tracker-needle.vala
@@ -458,7 +458,7 @@ public class Tracker.Needle {
                if (add_to_model) {
                        TreeIter new_iter;
 
-                       ListStore store = (ListStore) model;
+                       Gtk.ListStore store = (Gtk.ListStore) model;
                        store.prepend (out new_iter);
                        store.set (new_iter, 0, criteria, -1);
 
diff --git a/src/tracker-needle/tracker-tags-view.vala b/src/tracker-needle/tracker-tags-view.vala
index cfae0fb..b9eb25d 100644
--- a/src/tracker-needle/tracker-tags-view.vala
+++ b/src/tracker-needle/tracker-tags-view.vala
@@ -60,7 +60,7 @@ public class TrackerTagsView : Box {
        private List<TagData> tag_data_requests;
        private List<string> files;
 
-       private ListStore store;
+       private Gtk.ListStore store;
 
        private const string UI_FILE = "tracker-needle.ui";
 
@@ -98,7 +98,7 @@ public class TrackerTagsView : Box {
 
                cancellable = new Cancellable ();
 
-               store = new ListStore (Col.N_COLUMNS,
+               store = new Gtk.ListStore (Col.N_COLUMNS,
                                       typeof (int),      /* Selection type */
                                       typeof (string),   /* Tag ID */
                                       typeof (string),   /* Tag Name */
@@ -648,7 +648,7 @@ public class TrackerTagsView : Box {
 
        private void untoggle_all () {
                TreeModel model = view.get_model ();
-               ListStore store = (ListStore) model;
+               Gtk.ListStore store = (Gtk.ListStore) model;
 
                model.foreach ((model, path, foreach_iter) => {
                        store.set (foreach_iter, Col.SELECTION, Selection.FALSE, -1);


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