Merge lp:~mterry/unity/gsettings into lp:unity

[Michael Terry]

This is to convert from gconf to gsettings (bug 656326). I've tested it and it seems to work, but would obviously benefit from more testing.

There are a few keys that seem to no longer be used? Maybe now would be a good time to drop them from the schema and the new convert file. I'm thinking of the search_template, search_hint, and webapp_use_chromium keys.

This isn't a *complete* port either, since a few gconf uses reference global desktop keys that are in the process of moving to gsettings. Once they get moved, you can remove gconf altogether. But with this branch, all the unity internal usage is gsettings.

[Neil J. Patel (njpatel)]

This doesn't really apply to Unity trunk, but might not be a bad thing to land in Unity 0.2 series if people are picking it up for whatever reason to use on maverick/natty.

Everything looks good, approved. Thanks :)

review: Approve

=== modified file 'HACKING'
--- HACKING	2010-03-01 14:30:33 +0000
+++ HACKING	2010-10-22 15:19:44 +0000
@@ -40,10 +40,10 @@
 
 Webapp switching:
   Unity can use two webapp systems, prism and chromium, you can toggle between
-  the two by setting the gconf key "/apps/unity/webapp_use_chromium" on or off
+  the two by setting the gsettings key "/apps/unity/webapp-use-chromium" on or off
 
 Setting unmovable apps:
-  To make a launcher unmovable set the desktop_file gconf key of the app to manditory
+  To make a launcher unmovable set the desktop-file gsettings key of the app to manditory
 
 setting bottom fixed apps:
-  To make a launcher appear at the bottom of the launchers and fixed in place, set the key "fixed" (bool) to true in the launchers gconf directory
+  To make a launcher appear at the bottom of the launchers and fixed in place, set the key "fixed" (bool) to true in the launchers gsettings directory
 
=== modified file 'configure.ac'
--- configure.ac	2010-09-27 18:41:44 +0000
+++ configure.ac	2010-10-22 15:19:44 +0000
@@ -63,9 +63,7 @@
   PREFIX="${prefix}"
 fi
 
-dnl GConf schema installation
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
-AM_GCONF_SOURCE_2
+GLIB_GSETTINGS
 
 AC_DEFINE_UNQUOTED(LOCALE_DIR, "${PREFIX}/${DATADIRNAME}/locale",[Locale directory])
 AC_DEFINE_UNQUOTED(DATADIR, "${PREFIX}/${DATADIRNAME}",[Data directory])
@@ -95,7 +93,7 @@
 AC_SUBST(MAINTAINER_VALAFLAGS)
 
 dnl Check for module and library dependancies
-GLIB_REQUIRED=2.22
+GLIB_REQUIRED=2.26
 GTK_REQUIRED=2.18
 PKG_CHECK_MODULES(BASE,
                   clutter-1.0 >= 1.0
 
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2010-09-03 14:04:37 +0000
+++ data/Makefile.am	2010-10-22 15:19:44 +0000
@@ -24,18 +24,13 @@
 
 defaultdir = $(pkgdatadir)
 
-# Schemas
-schemadir = $(sysconfdir)/gconf/schemas
-dist_schema_DATA = unity.schemas
-
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-	$(GCONFTOOL) --makefile-install-rule $(dist_schema_DATA)
-endif
-
-if GCONF_SCHEMAS_INSTALL
-uninstall-local:
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-	$(GCONFTOOL) --makefile-uninstall-rule $(dist_schema_DATA)
-endif
+# Schema
+@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
+gsettings_SCHEMAS = com.canonical.Unity.gschema.xml
+
+convertdir = $(datadir)/GConf/gsettings
+dist_convert_DATA = unity.convert
+
+EXTRA_DIST = $(gsettings_SCHEMAS:.xml=.xml.in)
+DISTCLEANFILES = $(gsettings_SCHEMAS)
 
=== renamed file 'data/unity.schemas' => 'data/com.canonical.Unity.gschema.xml.in'
--- data/unity.schemas	2010-09-22 13:38:06 +0000
+++ data/com.canonical.Unity.gschema.xml.in	2010-10-22 15:19:44 +0000
@@ -1,57 +1,56 @@
-<gconfschemafile>
-  <schemalist>
-
-<!-- PANEL KEYS -->
-
-    <schema>
-      <key>/schemas/desktop/unity/panel/search_template</key>
-      <applyto>/desktop/unity/panel/search_template</applyto>
-      <owner>unity</owner>
-      <type>string</type>
-      <default>xdg-open http://www.google.com/cse?cx=partner-pub-9300639326172081%3Ad9bbzbtli15&amp;ie=UTF-8&amp;sa=Search&amp;q=%s</default>
-      <locale name="C">
-        <short>The search template used for panel search</short>
-        <long>The search template used for panel search. '%s' is substituted with the search string.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/desktop/unity/panel/search_hint</key>
-      <applyto>/desktop/unity/panel/search_hint</applyto>
-      <owner>unity</owner>
-      <type>string</type>
-      <default>Google</default>
-      <locale name="C">
-        <short>The search hint used for panel search</short>
-        <long>The search hint used for panel search.</long>
-      </locale>
-    </schema>
-
-<!-- LAUNCHER KEYS -->
-
-    <schema>
-      <key>/schemas/desktop/unity/launcher/webapp_use_chromium</key>
-      <applyto>/desktop/unity/launcher/webapp_use_chromium</applyto>
-      <owner>unity</owner>
-      <type>bool</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Whether the launcher should create Chromium-based webapps</short>
-        <long>Whether the launcher should create Chromium-based webapps. If this is False, Prism-based webapps will be created.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/desktop/unity/launcher/super_key_enable</key>
-      <applyto>/desktop/unity/launcher/super_key_enable</applyto>
-      <owner>unity</owner>
-      <type>bool</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Enable super key or not</short>
-        <long>Enable/disable super key. If this is False, super key will not function.</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema id="com.canonical.Unity" path="/desktop/unity/">
+    <child name="panel" schema="com.canonical.Unity.Panel"/>
+    <child name="launcher" schema="com.canonical.Unity.Launcher"/>
+  </schema>
+  <schema id="com.canonical.Unity.Panel" path="/desktop/unity/panel/">
+    <key name="search-template" type="s">
+      <default>'xdg-open http://www.google.com/cse?cx=partner-pub-9300639326172081%3Ad9bbzbtli15&amp;ie=UTF-8&amp;sa=Search&amp;q=%s'</default>
+      <_summary>The search template used for panel search</_summary>
+      <_description>The search template used for panel search. '%s' is substituted with the search string.</_description>
+    </key>
+    <key name="search-hint" type="s">
+      <default>'Google'</default>
+      <_summary>The search hint used for panel search</_summary>
+      <_description>The search hint used for panel search.</_description>
+    </key>
+  </schema>
+  <schema id="com.canonical.Unity.Launcher" path="/desktop/unity/launcher/">
+    <key name="webapp-use-chromium" type="b">
+      <default>true</default>
+      <_summary>Whether the launcher should create Chromium-based webapps</_summary>
+      <_description>Whether the launcher should create Chromium-based webapps. If this is False, Prism-based webapps will be created.</_description>
+    </key>
+    <key name="super-key-enable" type="b">
+      <default>true</default>
+      <_summary>Enable super key or not</_summary>
+      <_description>Enable/disable super key. If this is False, super key will not function.</_description>
+    </key>
+    <child name="favorites" schema="com.canonical.Unity.Launcher.Favorites"/>
+  </schema>
+  <schema id="com.canonical.Unity.Launcher.Favorites" path="/desktop/unity/launcher/favorites/">
+    <key name="favorites-list" type="as">
+      <default>[]</default>
+    </key>
+    <key name="migrated" type="b">
+      <default>false</default>
+      <_summary>Whether gconf favorites have been migrated</_summary>
+      <_description>If false, the first time Unity is run, old gconf favorites will be moved over.</_description>
+    </key>
+  </schema>
+  <schema id="com.canonical.Unity.Launcher.Favorites.Favorite">
+    <key name="type" type="s">
+      <choices>
+        <choice value='application'/>
+      </choices>
+      <default>'application'</default>
+    </key>
+    <key name="desktop-file" type="s">
+      <default>''</default>
+    </key>
+    <key name="priority" type="d">
+      <default>0</default>
+    </key>
+  </schema>
+</schemalist>
 
=== added file 'data/unity.convert'
--- data/unity.convert	1970-01-01 00:00:00 +0000
+++ data/unity.convert	2010-10-22 15:19:44 +0000
@@ -0,0 +1,10 @@
+[com.canonical.Unity.Panel]
+search-template = /desktop/unity/panel/search_template
+search-hint = /desktop/unity/panel/search_hint
+
+[com.canonical.Unity.Launcher]
+webapp-use-chromium = /desktop/unity/launcher/webapp_use_chromium
+super-key-enable = /desktop/unity/launcher/super_key_enable
+
+[com.canonical.Unity.Launcher.Favorites]
+favorites-list = /desktop/unity/launcher/favorites/favorites_list
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2010-09-14 13:45:42 +0000
+++ po/POTFILES.in	2010-10-22 15:19:44 +0000
@@ -6,4 +6,5 @@
 unity-private/places/places-place-search-entry.vala
 unity-private/places/places-trash-controller.vala
 unity-private/places/places-volume-child-controller.vala
+data/com.canonical.Unity.gschema.xml.in
 
 
=== modified file 'targets/mutter/Makefile.am'
--- targets/mutter/Makefile.am	2010-09-22 16:30:03 +0000
+++ targets/mutter/Makefile.am	2010-10-22 15:19:44 +0000
@@ -52,7 +52,6 @@
   --pkg unity-const \
   --pkg unity \
   --pkg unity-private \
-  --pkg gconf-2.0 \
   $(MAINTAINER_VALAFLAGS)
 
 libunity_mutter_la_LIBADD = \
 
=== modified file 'targets/mutter/plugin.vala'
--- targets/mutter/plugin.vala	2010-09-24 13:51:00 +0000
+++ targets/mutter/plugin.vala	2010-10-22 15:19:44 +0000
@@ -17,7 +17,6 @@
  *
  */
 
-using GConf;
 using Unity;
 using Unity.Testing;
 
@@ -174,6 +173,8 @@
     public Gesture.Dispatcher gesture_dispatcher;
     private Gesture.Type active_gesture_type = Gesture.Type.NONE;
 
+    private Settings settings;
+
     /* Pinch info */
     /* private float start_pinch_radius = 0.0f; */
     private unowned Mutter.Window? resize_window = null;
@@ -204,10 +205,6 @@
     private ExposeType expose_type = ExposeType.NONE;
     private unowned Mutter.Window? start_pinch_window = null;
 
-    /* const */
-    private const string GCONF_DIR = "/desktop/unity/launcher";
-    private const string GCONF_SUPER_KEY_ENABLE_KEY = "super_key_enable";
-
     construct
     {
       is_starting = true;
@@ -293,21 +290,11 @@
       /* we need to hook into the super key bound by mutter for g-shell.
          don't ask me why mutter binds things for g-shell explictly...
          */
-      var gc = GConf.Client.get_default();
       Mutter.MetaDisplay display = Mutter.MetaScreen.get_display (plugin.get_screen ());
 
-      try {
-      	  super_key_enable = gc.get_bool(GCONF_DIR + "/" + GCONF_SUPER_KEY_ENABLE_KEY);
-      } catch (GLib.Error e) {
-          super_key_enable = true;
-          warning("Cannot find super_key_enable gconf key");
-      }
-      try {
-          gc.add_dir(GCONF_DIR, GConf.ClientPreloadType.ONELEVEL);
-      	  gc.notify_add(GCONF_DIR + "/" + GCONF_SUPER_KEY_ENABLE_KEY, this.gconf_super_key_enable_cb);
-      } catch (GLib.Error e) {
-          warning("Cannot set gconf callback function of super_key_enable");
-      }
+      this.settings = new Settings ("com.canonical.Unity.Launcher");
+      super_key_enable = this.settings.get_boolean ("super-key-enable");
+      this.settings.changed["super-key-enable"].connect (this.super_key_enable_cb);
 
       display.overlay_key_down.connect (() => {
           if (super_key_enable) {
@@ -400,14 +387,8 @@
       
     }
 
-    private void gconf_super_key_enable_cb(GConf.Client gc, uint cxnid, GConf.Entry entry) {
-      bool new_value = true;
-      try {
-          new_value = gc.get_bool(GCONF_DIR + "/" + GCONF_SUPER_KEY_ENABLE_KEY);
-      } catch (GLib.Error e) {
-          new_value = true;
-      }
-      super_key_enable = new_value;
+    private void super_key_enable_cb(Settings settings, string key) {
+      super_key_enable = settings.get_boolean (key);
     }
 
     private void on_focus_window_changed ()
 
=== modified file 'tools/migrate_favorites.py'
--- tools/migrate_favorites.py	2010-10-06 08:37:47 +0000
+++ tools/migrate_favorites.py	2010-10-22 15:19:44 +0000
@@ -12,6 +12,7 @@
 import gobject
 import os
 import sys
+import subprocess
 
 def get_desktop_dir():
     ''' no python binding from xdg to get the desktop directory? '''
@@ -52,8 +53,9 @@
         #print priority_position
     return (apps_list, priority_position)
 
-if os.path.exists(os.path.expanduser('~/.gconf/desktop/unity/')):
-    print "migration already done or unity used before migration support"
+migrated_call = subprocess.Popen(["gsettings", "get", "com.canonical.Unity.Launcher.Favorites", "migrated"], stdout=subprocess.PIPE)
+if migrated_call.communicate()[0].strip() == 'true':
+    print "migration already done"
     sys.exit(0)
 
 client = gconf.client_get_default()
@@ -62,6 +64,19 @@
 apps_list = client.get_list('/desktop/unity/launcher/favorites/favorites_list', gconf.VALUE_STRING)
 priority_position = len(apps_list) + 1
 
+if os.path.exists(os.path.expanduser('~/.gconf/desktop/unity/')):
+    # Unity has been run before and used gconf.  Convert its favorites over.
+    # Other keys are handled by gsettings-data-convert, which we run here just
+    # to be safe (because it normally *should* be run by login)
+    subprocess.call(["gsettings-data-convert"])
+    for app in apps_list:
+        path = '/desktop/unity/launcher/favorites/' + app
+        cmd = ["gsettings", "set", "-p", path, "com.canonical.Unity.Launcher.Favorites.Favorite"]
+        subprocess.call(cmd + ["desktop-file", "'%s'" % client.get_string("%s/desktop_file" % path)])
+        subprocess.call(cmd + ["type", "'%s'" % client.get_string("%s/type" % path)])
+        subprocess.call(cmd + ["priority", "%s" % client.get_float("%s/priority" % path)])
+    sys.exit(0)
+
 # get GNOME panel favorites and convert them
 panel_list = client.get_list('/apps/panel/general/toplevel_id_list', gconf.VALUE_STRING)
 candidate_objects = client.get_list('/apps/panel/general/object_id_list', gconf.VALUE_STRING)
 
=== modified file 'unity-private/launcher/application-controller.vala'
--- unity-private/launcher/application-controller.vala	2010-09-27 16:15:53 +0000
+++ unity-private/launcher/application-controller.vala	2010-10-22 15:19:44 +0000
@@ -107,7 +107,7 @@
       if (is_sticky)
         {
           favorites.set_string (fav_id, "type", "application");
-          favorites.set_string (fav_id, "desktop_file", desktop_file);
+          favorites.set_string (fav_id, "desktop-file", desktop_file);
           favorites.add_favorite (fav_id);
         }
       else
 
=== modified file 'unity-private/launcher/scroller-controller.vala'
--- unity-private/launcher/scroller-controller.vala	2010-09-24 12:37:02 +0000
+++ unity-private/launcher/scroller-controller.vala	2010-10-22 15:19:44 +0000
@@ -218,7 +218,7 @@
 
       foreach (string uid in favorites.get_favorites ())
         {
-          string desktop_file = favorites.get_string (uid, "desktop_file");
+          string desktop_file = favorites.get_string (uid, "desktop-file");
           if (!FileUtils.test (desktop_file, FileTest.EXISTS))
             {
               // no desktop file for this favorite or it does not exist
@@ -249,7 +249,7 @@
 
     private void on_favorite_added (string uid)
     {
-      var desktop_file = favorites.get_string (uid, "desktop_file");
+      var desktop_file = favorites.get_string (uid, "desktop-file");
       if (!FileUtils.test (desktop_file, FileTest.EXISTS))
         {
           // no desktop file for this favorite or it does not exist
 
=== modified file 'unity/Makefile.am'
--- unity/Makefile.am	2010-08-23 17:01:29 +0000
+++ unity/Makefile.am	2010-10-22 15:19:44 +0000
@@ -46,7 +46,6 @@
   --pkg dbus-glib-1 \
   --pkg Dbusmenu-Glib-0.2 \
   --pkg dee-1.0 \
-  --pkg gconf-2.0 \
   --pkg gtk+-2.0 \
   --pkg gio-2.0 \
   --pkg gio-unix-2.0 \
 
=== modified file 'unity/chrome-handler.vala'
--- unity/chrome-handler.vala	2010-06-10 12:00:50 +0000
+++ unity/chrome-handler.vala	2010-10-22 15:19:44 +0000
@@ -144,7 +144,7 @@
 
       // we are not a favorite and we need to be favorited!
       favorites.set_string (uid, "type", "application");
-      favorites.set_string (uid, "desktop_file", desktop_path);
+      favorites.set_string (uid, "desktop-file", desktop_path);
       favorites.set_float (uid, "priority", -100000.0f);
       favorites.add_favorite (uid);
     }
@@ -166,7 +166,7 @@
           if (type != "application")
               continue;
 
-          string desktop_file = favorites.get_string(uid, "desktop_file");
+          string desktop_file = favorites.get_string(uid, "desktop-file");
           if (desktop_file == my_desktop_path)
             {
               myuid = uid;
 
=== modified file 'unity/prism-handler.vala'
--- unity/prism-handler.vala	2010-06-08 09:43:43 +0000
+++ unity/prism-handler.vala	2010-10-22 15:19:44 +0000
@@ -159,7 +159,7 @@
 
       // we are not a favorite and we need to be favorited!
       favorites.set_string (uid, "type", "application");
-      favorites.set_string (uid, "desktop_file", desktop_path);
+      favorites.set_string (uid, "desktop-file", desktop_path);
       favorites.add_favorite (uid);
     }
 
@@ -180,7 +180,7 @@
           if (type != "application")
               continue;
 
-          string desktop_file = favorites.get_string(uid, "desktop_file");
+          string desktop_file = favorites.get_string(uid, "desktop-file");
           if (desktop_file == my_desktop_path)
             {
               myuid = uid;
 
=== modified file 'unity/unity-favorites.vala'
--- unity/unity-favorites.vala	2010-09-09 10:16:54 +0000
+++ unity/unity-favorites.vala	2010-10-22 15:19:44 +0000
@@ -15,6 +15,7 @@
  * <http://www.gnu.org/licenses/>.
  *
  * Authored by Gordon Allott <[e-mail]>
+ *             Michael Terry <[e-mail]>
  */
 using Gee;
 
@@ -27,7 +28,7 @@
     public static Unity.Favorites get_default ()
     {
       if (!(Unity.favorites_singleton is Unity.Favorites))
-        Unity.favorites_singleton = new Unity.GConfFavorites ();
+        Unity.favorites_singleton = new Unity.GSettingsFavorites ();
       return Unity.favorites_singleton;
     }
 
@@ -55,56 +56,40 @@
     public abstract void set_bool (string uid, string name, bool value);
   }
 
-  public class GConfFavorites : Favorites
+  public class GSettingsFavorites : Favorites
   {
+    static const string schema = "com.canonical.Unity.Launcher.Favorites.Favorite";
     static const string path = "/desktop/unity/launcher/favorites/";
-    private GConf.Client? client;
-    private SList<string> fav_ids;
-    private HashMap<string, uint> notify_map;
+    private HashMap<string, Settings> settings_map;
+    private Settings fav_settings;
+    private string[] fav_ids;
 
     construct
     {
+      settings_map = new HashMap<string, Settings> (str_hash, str_equal);
+      fav_settings = new Settings ("com.canonical.Unity.Launcher.Favorites");
 
-      // try to migrate favorites from desktop, old UNE and gnome-panel
-      var gconf_custom_dir = Environment.get_home_dir () + "/.gconf/desktop/unity";
-      var migration_script = Config.PREFIXDIR + "/lib/unity/migrate_favorites.py";
-      if (!FileUtils.test(gconf_custom_dir, FileTest.IS_DIR) &&
-          FileUtils.test(migration_script, FileTest.IS_EXECUTABLE))
+      // try to migrate favorites from desktop, old UNE, gnome-panel, and gconf
+      if (!fav_settings.get_boolean ("migrated"))
         {
-          try
+          var migration_script = Config.PREFIXDIR + "/lib/unity/migrate_favorites.py";
+          if (FileUtils.test (migration_script, FileTest.IS_EXECUTABLE))
             {
-              GLib.Process.spawn_command_line_sync(migration_script);
+              try
+                {
+                  GLib.Process.spawn_command_line_sync (migration_script);
+                }
+              catch (SpawnError e) { } // no migration, don't bother
             }
-          catch (SpawnError e) { } // no migration, don't bother
+          fav_settings.set_boolean ("migrated", true);
         }
 
-      client = GConf.Client.get_default ();
-      notify_map = new HashMap<string, uint> ();
       favorite_added.connect (on_favorite_added);
       favorite_removed.connect (on_favorite_removed);
-      try
-        {
-          fav_ids = client.get_list (path + "favorites_list", GConf.ValueType.STRING);
-        }
-      catch (Error e)
-        {
-          warning ("Could not grab favorites from gconf %s", e.message);
-          fav_ids = new SList<string> ();
-        }
 
       // set a watch on the favorites list
-      try
-        {
-          client.add_dir (path + "favorites_list",
-                          GConf.ClientPreloadType.NONE);
-          client.notify_add (path + "favorites_list",
-                             notify_on_favorites_list_changed);
-        }
-      catch (Error e)
-        {
-          warning ("Unable to monitor gconf for favorites changes: %s",
-                   e.message);
-        }
+      fav_settings.changed["favorites-list"].connect (notify_on_favorites_list_changed);
+      notify_on_favorites_list_changed (fav_settings, "favorites-list");
     }
 
     /* abstract class implimentation */
@@ -112,11 +97,11 @@
 
     public override string find_uid_for_desktop_file (string desktop_file)
     {
-      /* goes through the gconf favorites and finds us a desktop file */
+      /* goes through the favorites and finds us a desktop file */
       string uid = "";
-      foreach (string id in fav_ids)
+      foreach (weak string id in fav_ids)
         {
-          string fav_desktop_file = get_string (id, "desktop_file");
+          string fav_desktop_file = get_string (id, "desktop-file");
           if (fav_desktop_file == desktop_file)
             {
               uid = id;
@@ -141,16 +126,14 @@
     {
       if (!is_favorite (uid))
         {
-          fav_ids.append (uid);
-          try
-            {
-              client.set_list (path + "favorites_list", GConf.ValueType.STRING, fav_ids);
-            }
-          catch (Error e)
-            {
-              warning ("Could not set the favorites list: %s", e.message);
-            }
-					favorite_added (uid);
+          string[] new_favs = new string[fav_ids.length + 1];
+          int i = 0;
+          foreach (weak string fav in fav_ids)
+            {
+              new_favs[i++] = fav;
+            }
+          new_favs[i] = uid;
+          fav_settings.set_strv ("favorites-list", (string*[])new_favs);
         }
     }
 
@@ -158,28 +141,18 @@
     {
       if (is_favorite (uid))
         {
-					unowned SList<string> l = null;
-					for (l = fav_ids; l != null; l = l.next)
-						{
-							string id = l.data;
-							if (id == uid)
-								{
-									fav_ids.remove (l.data);
-									break;
-								}
-						}
-          fav_ids.remove (uid);
-
-          try
-            {
-              client.set_list (path + "favorites_list", GConf.ValueType.STRING, fav_ids);
-            }
-          catch (Error e)
-            {
-              warning ("Could not set the favorites list: %s", e.message);
-            }
-
-					favorite_removed (uid);
+          string[] new_favs = new string[fav_ids.length - 1];
+          int i = 0;
+          foreach (weak string fav in fav_ids)
+            {
+              if (fav != uid)
+                {
+                  new_favs[i++] = fav;
+                }
+            }
+          new_favs.resize(i); /* just for the bizarre case of more than one match */
+
+          fav_settings.set_strv ("favorites-list", (string*[])new_favs);
         }
       else
         {
@@ -189,137 +162,73 @@
 
     public override bool is_favorite (string uid)
     {
-			foreach (string id in fav_ids)
-				{
-					if (id == uid)
-						{
-							return true;
-						}
-				}
-			return false;
-		}
+      foreach (weak string id in fav_ids)
+        {
+          if (id == uid)
+            {
+              return true;
+            }
+        }
+      return false;
+    }
 
     public override string? get_string (string uid, string name)
     {
-      string? return_string = null;
-      try
-        {
-          return_string = client.get_string (path + uid + "/" + name);
-        }
-      catch (Error e)
-        {
-          warning ("GConf string lookup failed: %s", e.message);
-        }
-      return return_string;
+      return get_settings (uid).get_string (name);
     }
 
     public override void set_string (string uid, string name, string value)
     {
-      try
-        {
-          client.set_string (path + uid + "/" + name, value);
-        }
-      catch (Error e)
-        {
-          warning ("GConf string setting failed: %s", e.message);
-        }
+      get_settings (uid).set_string (name, value);
     }
 
     public override int? get_int (string uid, string name)
     {
-      int? return_val = null;
-      try
-        {
-          return_val = client.get_int (path + uid + "/" + name);
-        }
-      catch (Error e)
-        {
-          warning ("GConf int lookup failed: %s", e.message);
-        }
-      return return_val;
+      return get_settings (uid).get_int (name);
     }
 
     public override void set_int (string uid, string name, int value)
     {
-      try
-        {
-          client.set_int (path + uid + "/" + name, value);
-        }
-      catch (Error e)
-        {
-          warning ("GConf int setting failed: %s", e.message);
-        }
+      get_settings (uid).set_int (name, value);
     }
 
     public override float? get_float (string uid, string name)
     {
-      float? return_val = null;
-      try
-        {
-          return_val = (float)(client.get_float (path + uid + "/" + name));
-        }
-      catch (Error e)
-        {
-          warning ("GConf float lookup failed: %s", e.message);
-        }
-      return return_val;
+      return (float) get_settings (uid).get_double (name);
     }
 
     public override void set_float (string uid, string name, float value)
     {
-      try
-        {
-          client.set_float (path + uid + "/" + name, value);
-        }
-      catch (Error e)
-        {
-          warning ("GConf float set failed: %s", e.message);
-        }
+      get_settings (uid).set_double (name, (double) value);
     }
 
     public override bool? get_bool (string uid, string name)
     {
-      bool? return_val = null;
-      try
-        {
-          return_val = client.get_bool (path + uid + "/" + name);
-        }
-      catch (Error e)
-        {
-          warning ("GConf bool lookup failed: %s", e.message);
-        }
-      return return_val;
+      return get_settings (uid).get_boolean (name);
     }
 
     public override void set_bool (string uid, string name, bool value)
     {
-      try
-        {
-          client.set_bool (path + uid + "/" + name, value);
-        }
-      catch (Error e)
-        {
-          warning ("GConf bool setting failed: %s", e.message);
-        }
+      get_settings (uid).set_boolean (name, value);
     }
 
     /* private methods */
     /* Expects a list of strings */
-    private void compare_string_list (SList<string> old_list, SList<string> new_list,
+    private void compare_string_list (string[] old_list, string[] new_list,
                                       out SList<string> added, out SList<string> removed)
     {
       SList<string> unchanged = new SList<string> ();
 
       foreach (string id in new_list)
         {
-					string? item = null;
-					foreach (string old_item in old_list)
-						{
-							if (id == old_item)
-								{
-									item = old_item;
-								}
-						}
+          string? item = null;
+          foreach (string old_item in old_list)
+            {
+              if (id == old_item)
+                {
+                  item = old_item;
+                }
+            }
 
           if (item != null)
             {
@@ -333,14 +242,14 @@
 
       foreach (string id in old_list)
         {
-					string? item = null;
-					foreach (string unchanged_item in unchanged)
-						{
-							if (unchanged_item == id)
-								{
-									item = unchanged_item;
-								}
-						}
+          string? item = null;
+          foreach (string unchanged_item in unchanged)
+            {
+              if (unchanged_item == id)
+                {
+                  item = unchanged_item;
+                }
+            }
 
           if (item == null)
             {
@@ -349,24 +258,29 @@
         }
     }
 
+    private Settings get_settings (string uid)
+    {
+      var rv = settings_map.get (uid);
+      if (rv == null)
+        {
+          rv = new Settings.with_path (schema, path + uid);
+          settings_map.set (uid, rv);
+        }
+      return rv;
+    }
+
 
     /* callbacks */
-    private void notify_on_favorites_list_changed ()
+    private void notify_on_favorites_list_changed (Settings settings, string key)
     {
       SList<string> items_added = new SList<string> ();
       SList<string> items_removed = new SList<string> ();
-      SList<string> new_favs;
-      try
-        {
-          new_favs = client.get_list (path + "favorites_list", GConf.ValueType.STRING);
-        }
-      catch (Error e)
-        {
-          warning ("Could not get favourite list from gconf %s", e.message);
-          return; // we return here because we can't do anything with no working gconf
-        }
+      string[] new_favs;
 
+      new_favs = settings.get_strv (key);
       compare_string_list (fav_ids, new_favs, out items_added, out items_removed);
+      fav_ids = new_favs;
+
       foreach (string id in items_added)
         {
           favorite_added (id);
@@ -379,45 +293,36 @@
 
     private void on_favorite_added (string uid)
     {
-       // set a watch on the favorite
-      try
-        {
-          client.add_dir (path + uid + "/",
-                          GConf.ClientPreloadType.NONE);
-          uint notify_id = client.notify_add (path + uid + "/",
-                                              notify_on_favorite_changed);
-          notify_map[uid] = notify_id;
-        }
-      catch (Error e)
-        {
-          warning ("Unable to monitor gconf for favorite changes: %s",
-                   e.message);
-        }
+      get_settings (uid).changed.connect (notify_on_favorite_changed);
     }
 
     private void on_favorite_removed (string uid)
     {
-      uint notify_id = notify_map[uid];
-      client.notify_remove (notify_id);
-      notify_map.unset (uid);
-
-      fav_ids.remove_all (uid);
+      settings_map.unset (uid);
     }
 
-    private void notify_on_favorite_changed (GConf.Client _client, uint cnxn_id, GConf.Entry entry)
+    private void notify_on_favorite_changed (Settings settings, string key)
     {
-      // we need to figure out our uid
-      // we expect /desktop/unity/launcher/favorites/uid/foobar so we just use splits
-      // regex's shouldn't be needed unless we do crazy stuff
-
-      string uid = entry.key.split (path, 2)[1].split ("/", 2)[0]; //should split up nicely :)
-      if (is_favorite (uid))
+      // We need to figure out our UID.
+      // Normally, we could just ask for the path of a Settings object and
+      // strip off the last chunk to find the UID.  But because of a glib crash
+      // https://bugzilla.gnome.org/show_bug.cgi?id=632899 we can't do that.
+      // So instead, do a reverse-lookup in our map for the UID.
+      string uid = null;
+      foreach (Map.Entry<string, Settings> entry in settings_map.entries)
+        {
+          if (entry.value == settings)
+            {
+              uid = entry.key;
+            }
+        }
+      if (uid != null && is_favorite (uid))
         {
           favorite_changed (uid);
         }
       else
         {
-          warning ("got strange uid %s: %s", uid, entry.key);
+          warning ("got strange uid %s: %s", uid, key);
           return;
         }
     }