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

[William Hua]

Sync the user's input sources up to accountsservice.

Sync the user's input sources up to accountsservice.

This depends on the debdiff from https://bugs.launchpad.net/ubuntu/+source/accountsservice/+bug/1209227.

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-16 03:58:04 +0000
+++ debian/changelog	2013-08-07 12:59:36 +0000
@@ -18,6 +18,10 @@
     - Set switch-input-source keyboard shortcut to Super+Space to match ibus,
       GNOME 3.8 and Windows 8 default
 
+  [ William Hua ]
+  * debian/patches/sync_input_sources_to_accountsservice.patch:
+    - Update user's accountsservice input sources whenever they change.
+
  -- William Hua <[e-mail]>  Mon, 15 Jul 2013 17:20:35 -0400
 
 gnome-settings-daemon (3.6.4-0ubuntu15) saucy; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-07-08 15:46:29 +0000
+++ debian/control	2013-08-07 12:59:36 +0000
@@ -43,7 +43,8 @@
                xserver-xorg-input-wacom,
                libgnomekbd-dev (>= 3.5.1),
                libxklavier-dev,
-               libibus-1.0-dev (>= 1.5.0)
+               libibus-1.0-dev (>= 1.5.0),
+               libaccountsservice-dev (>= 0.6.34)
 Standards-Version: 3.9.3
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-settings-daemon/ubuntu
 
@@ -53,7 +54,8 @@
          ${misc:Depends},
          gsettings-desktop-schemas (>= 3.3.90-0ubuntu2),
          nautilus-data (>= 2.91.3-1),
-         ibus (>= 1.5.0)
+         ibus (>= 1.5.0),
+         accountsservice (>= 0.6.34)
 Recommends: pulseaudio,
             systemd-services,
 Pre-Depends: ${misc:Pre-Depends}

=== modified file 'debian/control.in'
--- debian/control.in	2013-06-13 20:04:58 +0000
+++ debian/control.in	2013-08-07 12:59:36 +0000
@@ -39,7 +39,8 @@
                xserver-xorg-input-wacom,
                libgnomekbd-dev (>= 3.5.1),
                libxklavier-dev,
-               libibus-1.0-dev (>= 1.5.0)
+               libibus-1.0-dev (>= 1.5.0),
+               libaccountsservice-dev (>= 0.6.34)
 Standards-Version: 3.9.3
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-settings-daemon/ubuntu
 
@@ -49,7 +50,8 @@
          ${misc:Depends},
          gsettings-desktop-schemas (>= 3.3.90-0ubuntu2),
          nautilus-data (>= 2.91.3-1),
-         ibus (>= 1.5.0)
+         ibus (>= 1.5.0),
+         accountsservice (>= 0.6.34)
 Recommends: pulseaudio,
             systemd-services,
 Pre-Depends: ${misc:Pre-Depends}

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-07-09 14:43:45 +0000
+++ debian/patches/series	2013-08-07 12:59:36 +0000
@@ -29,3 +29,4 @@
 ibus-ubuntu-session.patch
 git_keyboard_Adapt_to_gnome_xkb_info_API_change.patch
 git_keyboard_Adapt_to_gnome_xkb_info_API_change_2.patch
+sync_input_sources_to_accountsservice.patch

=== added file 'debian/patches/sync_input_sources_to_accountsservice.patch'
--- debian/patches/sync_input_sources_to_accountsservice.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/sync_input_sources_to_accountsservice.patch	2013-08-07 12:59:36 +0000
@@ -0,0 +1,94 @@
+--- a/plugins/keyboard/gsd-keyboard-manager.c
++++ b/plugins/keyboard/gsd-keyboard-manager.c
+@@ -50,6 +50,8 @@
+ #include <ibus.h>
+ #endif
+ 
++#include <act/act.h>
++
+ #include "gnome-settings-profile.h"
+ #include "gsd-keyboard-manager.h"
+ #include "gsd-input-helper.h"
+@@ -1059,6 +1061,50 @@
+         g_free (current_module);
+ }
+ 
++static void
++user_notify_is_loaded_cb (GObject    *object,
++                          GParamSpec *pspec,
++                          gpointer    user_data)
++{
++        ActUser *user = ACT_USER (object);
++        GSettings *settings = user_data;
++
++        if (act_user_is_loaded (user)) {
++                GVariant *sources;
++
++                g_signal_handlers_disconnect_by_data (user, user_data);
++
++                sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
++                act_user_set_input_sources (user, sources);
++                g_variant_unref (sources);
++        }
++}
++
++static void
++manager_notify_is_loaded_cb (GObject    *object,
++                             GParamSpec *pspec,
++                             gpointer    user_data)
++{
++        ActUserManager *manager = ACT_USER_MANAGER (object);
++
++        gboolean loaded;
++        g_object_get (manager, "is-loaded", &loaded, NULL);
++
++        if (loaded) {
++                ActUser *user;
++
++                g_signal_handlers_disconnect_by_data (manager, user_data);
++
++                user = act_user_manager_get_user (manager, g_get_user_name ());
++
++                if (act_user_is_loaded (user))
++                        user_notify_is_loaded_cb (G_OBJECT (user), NULL, user_data);
++                else
++                        g_signal_connect (user, "notify::is-loaded",
++                                          user_notify_is_loaded_cb, user_data);
++        }
++}
++
+ static gboolean
+ apply_input_sources_settings (GSettings          *settings,
+                               gpointer            keys,
+@@ -1074,11 +1120,20 @@
+         gchar *layout = NULL;
+         gchar *variant = NULL;
+         gchar **options = NULL;
++        ActUserManager *user_manager;
++        gboolean user_manager_loaded;
+ 
+         sources = g_settings_get_value (priv->input_sources_settings, KEY_INPUT_SOURCES);
+         current = g_settings_get_uint (priv->input_sources_settings, KEY_CURRENT_INPUT_SOURCE);
+         n_sources = g_variant_n_children (sources);
+ 
++        user_manager = act_user_manager_get_default ();
++        g_object_get (user_manager, "is-loaded", &user_manager_loaded, NULL);
++        if (user_manager_loaded)
++                manager_notify_is_loaded_cb (G_OBJECT (user_manager), NULL, settings);
++        else
++                g_signal_connect (user_manager, "notify::is-loaded", G_CALLBACK (manager_notify_is_loaded_cb), settings);
++
+         if (n_sources < 1)
+                 goto exit;
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -218,7 +218,7 @@
+ fi
+ AM_CONDITIONAL(HAVE_IBUS, test "x$enable_ibus" == "xyes")
+ 
+-PKG_CHECK_MODULES(KEYBOARD, xkbfile $IBUS_MODULE gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++PKG_CHECK_MODULES(KEYBOARD, accountsservice xkbfile $IBUS_MODULE gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - Housekeeping plugin stuff