Merge lp:~3v1n0/libunity/fix-ftb-wily into lp:libunity

[Marco Trevisan (Treviño)]

Tools: use proper type prefix to fix FTB

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:316
http://jenkins.qa.ubuntu.com/job/libunity-ci/141/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-wily-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-wily-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libunity-ci/141/rebuild

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM

review: Approve

=== modified file 'protocol/protocol-scope-discovery.vala'
--- protocol/protocol-scope-discovery.vala	2013-10-01 13:32:26 +0000
+++ protocol/protocol-scope-discovery.vala	2015-09-11 13:57:34 +0000
@@ -269,10 +269,11 @@
 
       internal static void update_hidden_scope_ids ()
       {
-        unowned string[] schemas = Settings.list_schemas ();
-        if (SCOPE_SCHEMA in schemas)
+        var schema_src = SettingsSchemaSource.get_default().lookup (SCOPE_SCHEMA, false);
+
+        if (schema_src != null)
         {
-          var settings = new Settings (SCOPE_SCHEMA);
+          var settings = new Settings.full (schema_src, null, null);
           hidden_scope_ids = settings.get_strv ("hidden-scopes");
         }
         else
 
=== modified file 'src/unity-launcher.vala'
--- src/unity-launcher.vala	2012-11-05 21:09:31 +0000
+++ src/unity-launcher.vala	2015-09-11 13:57:34 +0000
@@ -361,9 +361,11 @@
     private LauncherFavorites ()
     {
       fav_cache = new HashTable<string,AppInfo?> (str_hash, str_equal);
-      if (schema_exists (LAUNCHER_SCHEMA_NAME))
+      var schema_src = SettingsSchemaSource.get_default().lookup (LAUNCHER_SCHEMA_NAME, false);
+
+      if (schema_src != null)
       {
-        settings = new Settings (LAUNCHER_SCHEMA_NAME);
+        var settings = new Settings.full (schema_src, null, null);
         reset_fav_cache ();
 
         settings.changed["favorites"].connect (reset_fav_cache);
@@ -374,12 +376,6 @@
       }
     }
 
-    private static bool schema_exists (string schema)
-    {
-      unowned string[] installed_schemas = Settings.list_schemas ();
-      return schema in installed_schemas;
-    }
-
     private void reset_fav_cache ()
     {
       fav_cache.remove_all ();
 
=== modified file 'test/vala/test-launcher-integration.vala'
--- test/vala/test-launcher-integration.vala	2012-11-05 21:09:31 +0000
+++ test/vala/test-launcher-integration.vala	2015-09-11 13:57:34 +0000
@@ -29,8 +29,7 @@
 
   public static bool schema_exists (string schema)
   {
-    unowned string[] installed_schemas = Settings.list_schemas ();
-    return schema in installed_schemas;
+    return SettingsSchemaSource.get_default().lookup (schema, false) != null;
   }
 
   public static int main (string[] args)
 
=== modified file 'tools/music-track-model-renderer.vala'
--- tools/music-track-model-renderer.vala	2013-07-22 12:04:23 +0000
+++ tools/music-track-model-renderer.vala	2015-09-11 13:57:34 +0000
@@ -17,8 +17,6 @@
  *
  */
 
-using Gtk;
-
 namespace Unity.Tester {
 
 public class MusicTrackModelRenderer: Object
@@ -27,13 +25,13 @@
     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)
@@ -67,8 +65,8 @@
         var row = model.get_row(iter);
 
         track_model_tag.set(track_model, iter, row_counter++);
-        
-        TreeIter tm_iter;
+
+        Gtk.TreeIter tm_iter;
         track_view_model.append(out tm_iter);
         track_view_model.set(tm_iter, 0, row[0].get_string(), 1, row[1].get_int32(), 2, row[2].get_string(), 3, row[3].get_uint32(), 4, row[4].get_uint32(), 5, row[5].get_double(), -1);
     }
@@ -76,7 +74,7 @@
     private void track_changed_cb(Dee.Model model, Dee.ModelIter iter)
     {
         int index = track_model_tag.get(track_model, iter);
-        TreeIter tm_iter;
+        Gtk.TreeIter tm_iter;
         if (track_view_model.get_iter_first(out tm_iter)) {
             while (index > 0)
             {
 
=== modified file 'tools/preview-renderer.vala'
--- tools/preview-renderer.vala	2013-07-22 12:04:23 +0000
+++ tools/preview-renderer.vala	2015-09-11 13:57:34 +0000
@@ -148,12 +148,17 @@
             icon_label.set_markup(name);
             grid.attach(icon_label, 0, row, 1, 1);
             var themed_icon = Gtk.IconTheme.get_default().lookup_by_gicon(icon, size, 0);
-            var pixbuf = themed_icon.load_icon();
-            Gtk.Image image = new Gtk.Image.from_pixbuf(pixbuf);
-            if (tooltip != null) {
-                image.set_tooltip_text(tooltip);
-            }
-            grid.attach(image, 1, row, 1, 1);
+            try {
+                var pixbuf = themed_icon.load_icon();
+                Gtk.Image image = new Gtk.Image.from_pixbuf(pixbuf);
+                if (tooltip != null) {
+                    image.set_tooltip_text(tooltip);
+                }
+                grid.attach(image, 1, row, 1, 1);
+            }
+            catch (GLib.Error e) {
+                warning(@"Got error while loading pixmap: $(e.message)");
+            }
 
             ++row;
         }
 
=== modified file 'tools/unity-tool-ui.vala'
--- tools/unity-tool-ui.vala	2013-09-24 08:57:39 +0000
+++ tools/unity-tool-ui.vala	2015-09-11 13:57:34 +0000
@@ -40,9 +40,9 @@
             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 @@
             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 @@
     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 = "";