Merge lp:~sil2100/libunity/fix-1062099-6.0 into lp:libunity/6.0

[Łukasz Zemczak]

Cherry-picked from trunk rev118: Check for existence of schemas which we don't ship

From trunk:

Check for existence of schemas which we don't ship

[Paweł Stołowski (stolowski)]

+1

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'src/unity-launcher.vala'
--- src/unity-launcher.vala	2012-09-18 14:36:14 +0000
+++ src/unity-launcher.vala	2012-10-05 12:48:25 +0000
@@ -349,21 +349,35 @@
   public class LauncherFavorites : Object
   {
     public signal void changed ();
-    
+  
+    private const string LAUNCHER_SCHEMA_NAME = "com.canonical.Unity.Launcher";
     private static LauncherFavorites? singleton = null;
     private Settings settings;
     
     /* We keep both a map and a list in order to have the correct sorting */
     private HashTable<string,AppInfo?> fav_cache;
     private string[] fav_list;
-    
+
     private LauncherFavorites ()
     {
-      settings = new Settings ("com.canonical.Unity.Launcher");
       fav_cache = new HashTable<string,AppInfo?> (str_hash, str_equal);
-      reset_fav_cache ();
-      
-      settings.changed["favorites"].connect (reset_fav_cache);
+      if (schema_exists (LAUNCHER_SCHEMA_NAME))
+      {
+        settings = new Settings (LAUNCHER_SCHEMA_NAME);
+        reset_fav_cache ();
+
+        settings.changed["favorites"].connect (reset_fav_cache);
+      }
+      else
+      {
+        warning ("Schema \"%s\" is not installed!", LAUNCHER_SCHEMA_NAME);
+      }
+    }
+
+    private static bool schema_exists (string schema)
+    {
+      unowned string[] installed_schemas = Settings.list_schemas ();
+      return schema in installed_schemas;
     }
 
     private void reset_fav_cache ()

=== modified file 'test/vala/test-launcher-integration.vala'
--- test/vala/test-launcher-integration.vala	2012-09-10 14:21:49 +0000
+++ test/vala/test-launcher-integration.vala	2012-10-05 12:48:25 +0000
@@ -25,6 +25,14 @@
 
 public class Main
 {
+  public const string LAUNCHER_SCHEMA_NAME = "com.canonical.Unity.Launcher";
+
+  public static bool schema_exists (string schema)
+  {
+    unowned string[] installed_schemas = Settings.list_schemas ();
+    return schema in installed_schemas;
+  }
+
   public static int main (string[] args)
   {
     /* Prepend test search path for XDG_DATA_DIRS so we can find
@@ -38,7 +46,13 @@
     
     /* Make sure we don't hose the user env with our tests... */
     Environment.set_variable ("GSETTINGS_BACKEND", "memory", true);
-    
+
+    if (!schema_exists (LAUNCHER_SCHEMA_NAME))
+    {
+      warning ("Schema \"%s\" is not installed, skipping LauncherFavorites tests", LAUNCHER_SCHEMA_NAME);
+      return 0;
+    }
+
     Test.init (ref args);
 
     Test.add_data_func ("/Integration/Launcher/Favorites/UnknownApps",
@@ -66,7 +80,7 @@
   
   internal static void set_up () {  
     assert ("memory" == Environment.get_variable ("GSETTINGS_BACKEND"));
-    var settings = new Settings ("com.canonical.Unity.Launcher");
+    var settings = new Settings (LAUNCHER_SCHEMA_NAME);
     
     string[] faves = { "rhythmbox.desktop", "file://testapp1.desktop",
                        "application://ubuntu-about.desktop",
@@ -159,7 +173,7 @@
     });
     
     /* Change the faves */
-    var settings = new Settings ("com.canonical.Unity.Launcher");
+    var settings = new Settings (LAUNCHER_SCHEMA_NAME);
     string[] new_faves = { "rhythmbox.desktop" };
     settings.set_strv ("favorites", new_faves);