From: Barry Warsaw <barry@python.org>
Date: Wed, 2 Sep 2015 15:11:10 -0400
Subject: Fix ambiguous ListStore reference in favor of Gtk.ListStore.

---
 tools/music-track-model-renderer.vala |  4 ++--
 tools/unity-tool-ui.vala              | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/music-track-model-renderer.vala b/tools/music-track-model-renderer.vala
index d87cd75..78c282f 100644
--- a/tools/music-track-model-renderer.vala
+++ b/tools/music-track-model-renderer.vala
@@ -27,13 +27,13 @@ public class MusicTrackModelRenderer: Object
     private Dee.ModelTag<int> track_model_tag;
     private int row_counter = 0;
     private ulong model_sync_sig_id = 0;
-    public ListStore track_view_model { get; construct; }
+    public Gtk.ListStore track_view_model { get; construct; }
 
     public signal void track_list_synchronized();
 
     construct
     {
-        track_view_model = new ListStore(6, typeof(string), typeof(int), typeof(string), typeof(uint), typeof(uint), typeof(double));
+        track_view_model = new Gtk.ListStore(6, typeof(string), typeof(int), typeof(string), typeof(uint), typeof(uint), typeof(double));
     }
 
     public MusicTrackModelRenderer(Dee.Model track_model)
diff --git a/tools/unity-tool-ui.vala b/tools/unity-tool-ui.vala
index d20e225..7d1681b 100644
--- a/tools/unity-tool-ui.vala
+++ b/tools/unity-tool-ui.vala
@@ -40,9 +40,9 @@ public class UnityToolUi: GLib.Object
             window.destroy.connect(Gtk.main_quit);
             window.show_all();
 
-            uimodel = builder.get_object("results_model") as ListStore;
-            ui_filter_model = builder.get_object("filters_model") as ListStore;
-            ui_cat_model = builder.get_object("categories_model") as ListStore;
+            uimodel = builder.get_object("results_model") as Gtk.ListStore;
+            ui_filter_model = builder.get_object("filters_model") as Gtk.ListStore;
+            ui_cat_model = builder.get_object("categories_model") as Gtk.ListStore;
 
             notebook = builder.get_object("notebook") as Notebook;
             search_entry = builder.get_object("search_entry") as Entry;
@@ -155,7 +155,7 @@ public class UnityToolUi: GLib.Object
             builder.add_from_resource("/com/canonical/Unity/unity-tool/dbus-scope-connect.ui");
             builder.connect_signals(this);
             scope_discovery_spinner = builder.get_object("scope_discovery_spinner") as Spinner;
-            scope_list_model = builder.get_object("scope_list_model") as ListStore;
+            scope_list_model = builder.get_object("scope_list_model") as Gtk.ListStore;
             scope_list_combobox = builder.get_object("scope_list_combobox") as ComboBox;
             dbus_name_entry = builder.get_object("dbus_name_entry") as Entry;
             dbus_path_entry = builder.get_object("dbus_path_entry") as Entry;
@@ -843,10 +843,10 @@ public class UnityToolUi: GLib.Object
     private Gtk.Entry dbus_name_entry = null;
     private Gtk.Entry dbus_path_entry = null;
     private Gtk.ComboBox scope_list_combobox = null;
-    private ListStore uimodel = null;
-    private ListStore ui_filter_model = null;
-    private ListStore scope_list_model = null;
-    private ListStore ui_cat_model = null;
+    private Gtk.ListStore uimodel = null;
+    private Gtk.ListStore ui_filter_model = null;
+    private Gtk.ListStore scope_list_model = null;
+    private Gtk.ListStore ui_cat_model = null;
     private ulong model_sync_sig_id;
     private Dee.SharedModel? dee_results_model = null;
     private string current_channel_id = "";