Merge lp:~attente/gnome-settings-daemon/input-sources-type-mismatch into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[William Hua]

Fix input sources type mismatch between g-s-d and accountsservice.

The type for user's input sources changed at some point, I neglected to make the corresponding change in g-s-d.

Fix input sources type mismatch between g-s-d and accountsservice.

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-09 23:53:01 +0000
+++ debian/changelog	2013-09-10 05:13:59 +0000
@@ -1,3 +1,10 @@
+gnome-settings-daemon (3.8.5-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/patches/53_sync_input_sources_to_accountsservice.patch:
+    - Fix type mismatch between g-s-d and accountsservice.
+
+ -- William Hua <[e-mail]>  Tue, 10 Sep 2013 01:02:02 -0400
+
 gnome-settings-daemon (3.8.5-0ubuntu2) saucy; urgency=low
 
   * debian/patches/ubuntu-lid-close-suspend.patch:

=== modified file 'debian/patches/53_sync_input_sources_to_accountsservice.patch'
--- debian/patches/53_sync_input_sources_to_accountsservice.patch	2013-09-01 15:22:24 +0000
+++ debian/patches/53_sync_input_sources_to_accountsservice.patch	2013-09-10 05:13:59 +0000
@@ -1,7 +1,5 @@
-Index: gnome-settings-daemon-3.8.4/plugins/keyboard/gsd-keyboard-manager.c
-===================================================================
---- gnome-settings-daemon-3.8.4.orig/plugins/keyboard/gsd-keyboard-manager.c	2013-09-01 11:09:39.478632306 -0400
-+++ gnome-settings-daemon-3.8.4/plugins/keyboard/gsd-keyboard-manager.c	2013-09-01 11:09:56.110631611 -0400
+--- a/plugins/keyboard/gsd-keyboard-manager.c
++++ b/plugins/keyboard/gsd-keyboard-manager.c
 @@ -50,6 +50,8 @@
  #include <ibus.h>
  #endif
@@ -11,7 +9,7 @@
  #include "gnome-settings-session.h"
  #include "gnome-settings-profile.h"
  #include "gsd-keyboard-manager.h"
-@@ -969,6 +971,50 @@
+@@ -969,6 +971,67 @@
          g_free (rules_file_path);
  }
  
@@ -25,10 +23,27 @@
 +
 +        if (act_user_is_loaded (user)) {
 +                GVariant *sources;
++                GVariantIter iter;
++                const gchar *type;
++                const gchar *name;
++                GVariantBuilder builder;
 +
 +                g_signal_handlers_disconnect_by_data (user, user_data);
 +
 +                sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
++
++                g_variant_builder_init (&builder, G_VARIANT_TYPE ("aa{ss}"));
++
++                g_variant_iter_init (&iter, sources);
++                while (g_variant_iter_next (&iter, "(&s&s)", &type, &name)) {
++                        g_variant_builder_open (&builder, G_VARIANT_TYPE ("a{ss}"));
++                        g_variant_builder_add (&builder, "{ss}", type, name);
++                        g_variant_builder_close (&builder);
++                }
++
++                g_variant_unref (sources);
++
++                sources = g_variant_ref_sink (g_variant_builder_end (&builder));
 +                act_user_set_input_sources (user, sources);
 +                g_variant_unref (sources);
 +        }
@@ -62,7 +77,7 @@
  static gboolean
  apply_input_sources_settings (GSettings          *settings,
                                gpointer            keys,
-@@ -984,11 +1030,20 @@
+@@ -984,11 +1047,20 @@
          gchar *layout = NULL;
          gchar *variant = NULL;
          gchar **options = NULL;
@@ -83,10 +98,8 @@
          if (n_sources < 1)
                  goto exit;
  
-Index: gnome-settings-daemon-3.8.4/configure.ac
-===================================================================
---- gnome-settings-daemon-3.8.4.orig/configure.ac	2013-09-01 11:09:39.478632306 -0400
-+++ gnome-settings-daemon-3.8.4/configure.ac	2013-09-01 11:09:39.466632307 -0400
+--- a/configure.ac
++++ b/configure.ac
 @@ -195,7 +195,7 @@
  fi
  AM_CONDITIONAL(HAVE_IBUS, test "x$enable_ibus" == "xyes")