vala-ambiguity.patch

   1 --- libunity-6.12.0/tools/music-track-model-renderer.vala~      2012-10-27 18:16:03.000000000 +0200
   2 +++ libunity-6.12.0/tools/music-track-model-renderer.vala       2016-05-05 17:50:43.227260841 +0200
   3 @@ -28,13 +28,13 @@
   4      private Dee.ModelTag<int> track_model_tag;
   5      private int row_counter = 0;
   6      private ulong model_sync_sig_id = 0;
   7 -    public ListStore track_view_model { get; construct; }
   8 +    public Gtk.ListStore track_view_model { get; construct; }
   9
  10      public signal void track_list_synchronized();
  11
  12      construct
  13      {
  14 -        track_view_model = new ListStore(6, typeof(string), typeof(int), typeof(string), typeof(uint), typeof(uint), typeof(double));
  15 +        track_view_model = new Gtk.ListStore(6, typeof(string), typeof(int), typeof(string), typeof(uint), typeof(uint), typeof(double));
  16      }
  17
  18      public MusicTrackModelRenderer(string dbus_model)
  19 --- libunity-6.12.0/tools/unity-tool-ui.vala~   2012-10-27 18:16:03.000000000 +0200
  20 +++ libunity-6.12.0/tools/unity-tool-ui.vala    2016-05-05 17:50:39.393882489 +0200
  21 @@ -40,8 +40,8 @@
  22              window.destroy.connect(Gtk.main_quit);
  23              window.show_all();
  24
  25 -            uimodel = builder.get_object("results_model") as ListStore;
  26 -            ui_filter_model = builder.get_object("filters_model") as ListStore;
  27 +            uimodel = builder.get_object("results_model") as Gtk.ListStore;
  28 +            ui_filter_model = builder.get_object("filters_model") as Gtk.ListStore;
  29
  30              notebook = builder.get_object("notebook") as Notebook;
  31              search_entry = builder.get_object("search_entry") as Entry;
  32 @@ -154,7 +154,7 @@
  33              builder.add_from_resource("/com/canonical/Unity/unity-tool/dbus-lens-connect.ui");
  34              builder.connect_signals(this);
  35              lens_discovery_spinner = builder.get_object("lens_discovery_spinner") as Spinner;
  36 -            lens_list_model = builder.get_object("lens_list_model") as ListStore;
  37 +            lens_list_model = builder.get_object("lens_list_model") as Gtk.ListStore;
  38              lens_list_combobox = builder.get_object("lens_list_combobox") as ComboBox;
  39              dbus_name_entry = builder.get_object("dbus_name_entry") as Entry;
  40              dbus_path_entry = builder.get_object("dbus_path_entry") as Entry;
  41 @@ -779,9 +779,9 @@
  42      private Gtk.Entry dbus_name_entry = null;
  43      private Gtk.Entry dbus_path_entry = null;
  44      private Gtk.ComboBox lens_list_combobox = null;
  45 -    private ListStore uimodel = null;
  46 -    private ListStore ui_filter_model = null;
  47 -    private ListStore lens_list_model = null;
  48 +    private Gtk.ListStore uimodel = null;
  49 +    private Gtk.ListStore ui_filter_model = null;
  50 +    private Gtk.ListStore lens_list_model = null;
  51      private ulong model_sync_sig_id;
  52      private ulong filters_model_sync_sig_id;
  53      private Dee.SharedModel? dee_results_model = null;