Merge lp:~timo-jyrinki/gconf/ubuntu.support-s-to-as-migrations into lp:~ubuntu-desktop/gconf/ubuntu

[Timo Jyrinki]

Proposed patch adds support for converting string gconf keys to array string gsettings keys. It will be tried if the string -> string conversion fails. The patch has been tested working, but is not optimal.

Continuation from https://code.launchpad.net/~timo-jyrinki/gconf/support-s-to-as-migrations/+merge/123744 which was against a wrong branch.

This also includes the ubuntu3 from that other branch that was already uploaded.

[Didier Roche-Tolomelli (didrocks)]

approved, good work

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-23 21:43:22 +0000
+++ debian/changelog	2012-09-14 13:58:04 +0000
@@ -1,3 +1,18 @@
+gconf (3.2.5-0ubuntu4) UNRELEASED; urgency=low
+
+  * debian/patches/0001-Support-s-to-as-migrations-v2.patch:
+    - Support string to string array migrations (LP: #1048956)
+
+ -- Timo Jyrinki <[e-mail]>  Wed, 12 Sep 2012 15:32:10 +0300
+
+gconf (3.2.5-0ubuntu3) quantal; urgency=low
+
+  * debian/patches/call-dbus_g_thread_init.patch:
+    - Initialize dbus threads before doing anything. This fixes crashes in
+      multithreaded applications that don't use libdbus directly. (LP: #1048341)
+
+ -- Chow Loong Jin <[e-mail]>  Tue, 11 Sep 2012 10:12:41 +0800
+
 gconf (3.2.5-0ubuntu2) precise; urgency=low
 
   * Split gconf-service further into gconf-service and gconf-service-backend,

=== modified file 'debian/control'
--- debian/control	2012-03-23 21:43:17 +0000
+++ debian/control	2012-09-14 13:58:04 +0000
@@ -2,7 +2,6 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: gconf
 Section: libs
 Priority: optional

=== added file 'debian/patches/0001-Support-s-to-as-migrations-v2.patch'
--- debian/patches/0001-Support-s-to-as-migrations-v2.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-Support-s-to-as-migrations-v2.patch	2012-09-14 13:58:04 +0000
@@ -0,0 +1,46 @@
+From 24a40aadce621d01ede0d4add76599145778b6f8 Mon Sep 17 00:00:00 2001
+From: Timo Jyrinki <[e-mail]>
+Date: Fri, 14 Sep 2012 09:46:57 +0300
+Subject: [PATCH] Support 's' to 'as' migrations v2
+
+If a string's migration target is not a string, try to migrate it as a string array instead. It is a common change in schemas, so this is needed for example when migrating some metacity keys to org.gnome.desktop.wm.keybindings.
+---
+ gsettings/gsettings-data-convert.c |   22 ++++++++++++++++++++--
+ 1 file changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c
+index a8af942..48dfae9 100644
+--- a/gsettings/gsettings-data-convert.c
++++ b/gsettings/gsettings-data-convert.c
+@@ -238,8 +238,26 @@ handle_file (const gchar *filename)
+                 g_print ("Set key '%s' to string '%s'\n", keys[j],
+                          gconf_value_get_string (value));
+               else
+-                g_settings_set (settings, keys[j], "s",
+-                                gconf_value_get_string (value));
++                {
++                  GVariant *range, *type;
++                  range = g_settings_get_range (settings, keys[j]);
++                  g_variant_get (range, "(&sv)", NULL, &type);
++
++                  if (g_variant_is_of_type (type, G_VARIANT_TYPE_STRING_ARRAY))
++                    {
++                      g_settings_set (settings, keys[j], "s",
++                                      gconf_value_get_string (value));
++                    }
++                  else
++                    {
++                      if (verbose)
++                        g_debug ("Setting the target key '%s' as a string not possible, converting the string to a string array.\n", keys[j]);
++                      const gchar *array[2] = { gconf_value_get_string (value), NULL };
++                      g_settings_set_strv (settings, keys[j], array);
++                    }
++                  g_variant_unref (type);
++                  g_variant_unref (range);
++                }
+               break;
+ 
+             case GCONF_VALUE_INT:
+-- 
+1.7.10.4
+

=== added file 'debian/patches/call-dbus_g_thread_init.patch'
--- debian/patches/call-dbus_g_thread_init.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/call-dbus_g_thread_init.patch	2012-09-14 13:58:04 +0000
@@ -0,0 +1,21 @@
+Author: Chow Loong Jin <[e-mail]>
+Description: Call dbus_g_thread_init before calling any dbus functions
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1048341
+Index: gconf/gconf/gconf-dbus.c
+===================================================================
+--- gconf.orig/gconf/gconf-dbus.c	2012-09-11 09:54:10.056848441 +0800
++++ gconf/gconf/gconf-dbus.c	2012-09-11 10:07:03.967826677 +0800
+@@ -396,6 +396,13 @@
+       return FALSE;
+     }
+ 
++  /* Initialize DBus Glib for multithreading -- this fixes race conditions when
++     multi-threaded applications use gconf. Additionally, although the API
++     documentation says that dbus_g_thread_init() may only be called once, it is
++     actually really a wrapper for dbus_threads_init_default() which casn be
++     called as many times as necessary. */
++  dbus_g_thread_init ();
++
+   dbus_error_init (&error);
+ 
+   global_conn = dbus_bus_get_private (DBUS_BUS_SESSION, &error);

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-05 23:26:20 +0000
+++ debian/patches/series	2012-09-14 13:58:04 +0000
@@ -6,3 +6,5 @@
 05_nodisplay_autostart.patch
 06_onlyshowin_unity.patch
 25_gconf-path-max-hurd.patch
+call-dbus_g_thread_init.patch
+0001-Support-s-to-as-migrations-v2.patch