r52657 - in /desktop/unstable/gnome-settings-daemon/debian: changelog patches/keyboard-Only-add-the-us-layout-if-the-system-config.patch patches/series
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Fri Jul 14 12:25:56 UTC 2017
Author: bigon
Date: Fri Jul 14 12:25:56 2017
New Revision: 52657
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52657
Log:
d/p/keyboard-Only-add-the-us-layout-if-the-system-config.patch:
Do not add the "US" keyboard layout by default for new users, for some
reasons, this keyboard was prefered over the system configured one on the
first login. (Closes: #859268)
Added:
desktop/unstable/gnome-settings-daemon/debian/patches/keyboard-Only-add-the-us-layout-if-the-system-config.patch
Modified:
desktop/unstable/gnome-settings-daemon/debian/changelog
desktop/unstable/gnome-settings-daemon/debian/patches/series
Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=52657&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Fri Jul 14 12:25:56 2017
@@ -1,3 +1,12 @@
+gnome-settings-daemon (3.22.2-5) UNRELEASED; urgency=medium
+
+ * d/p/keyboard-Only-add-the-us-layout-if-the-system-config.patch:
+ Do not add the "US" keyboard layout by default for new users, for some
+ reasons, this keyboard was prefered over the system configured one on the
+ first login. (Closes: #859268)
+
+ -- Laurent Bigonville <bigon at debian.org> Fri, 14 Jul 2017 14:18:40 +0200
+
gnome-settings-daemon (3.22.2-4) unstable; urgency=medium
* debian/control.in: Add udev to the build-dependencies to fix the tests
Added: desktop/unstable/gnome-settings-daemon/debian/patches/keyboard-Only-add-the-us-layout-if-the-system-config.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/keyboard-Only-add-the-us-layout-if-the-system-config.patch?rev=52657&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/keyboard-Only-add-the-us-layout-if-the-system-config.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/keyboard-Only-add-the-us-layout-if-the-system-config.patch [utf-8] Fri Jul 14 12:25:56 2017
@@ -0,0 +1,72 @@
+From d68ef6ad95bd2a5210715feea4ca5112885bec92 Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon at bigon.be>
+Date: Fri, 7 Jul 2017 17:40:17 +0200
+Subject: [PATCH 1/4] keyboard: Only add the "us" layout if the system config
+ cannot be determined
+
+Currently, the "us" keyboard layout is always added the first time the
+user is login in, this should only be necessary if the system configured
+layout cannot be determined.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=784654
+---
+ plugins/keyboard/gsd-keyboard-manager.c | 18 +++++++-----------
+ 1 file changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
+index ddeeee69..ea67dda1 100644
+--- a/plugins/keyboard/gsd-keyboard-manager.c
++++ b/plugins/keyboard/gsd-keyboard-manager.c
+@@ -441,7 +441,6 @@ get_sources_from_xkb_config (GsdKeyboardManager *manager)
+ gint i, n;
+ gchar **layouts = NULL;
+ gchar **variants = NULL;
+- gboolean have_default_layout = FALSE;
+
+ v = g_dbus_proxy_get_cached_property (priv->localed, "X11Layout");
+ if (v) {
+@@ -451,8 +450,12 @@ get_sources_from_xkb_config (GsdKeyboardManager *manager)
+ g_variant_unref (v);
+ }
+
+- if (!layouts)
+- return;
++ init_builder_with_sources (&builder, priv->input_sources_settings);
++
++ if (!layouts) {
++ g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT);
++ goto out;
++ }
+
+ v = g_dbus_proxy_get_cached_property (priv->localed, "X11Variant");
+ if (v) {
+@@ -467,8 +470,6 @@ get_sources_from_xkb_config (GsdKeyboardManager *manager)
+ else
+ n = g_strv_length (layouts);
+
+- init_builder_with_sources (&builder, priv->input_sources_settings);
+-
+ for (i = 0; i < n && layouts[i][0]; ++i) {
+ gchar *id;
+
+@@ -477,16 +478,11 @@ get_sources_from_xkb_config (GsdKeyboardManager *manager)
+ else
+ id = g_strdup (layouts[i]);
+
+- if (g_str_equal (id, DEFAULT_LAYOUT))
+- have_default_layout = TRUE;
+-
+ g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, id);
+ g_free (id);
+ }
+
+- if (!have_default_layout)
+- g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, DEFAULT_LAYOUT);
+-
++out:
+ g_settings_set_value (priv->input_sources_settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
+
+ g_strfreev (layouts);
+--
+2.13.2
+
Modified: desktop/unstable/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/series?rev=52657&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] Fri Jul 14 12:25:56 2017
@@ -1,2 +1,3 @@
media-keys-Fix-mmkeys-D-Bus-API-to-match-API-docs.patch
04_superP.patch
+keyboard-Only-add-the-us-layout-if-the-system-config.patch
More information about the pkg-gnome-commits
mailing list