[libgnomekbd] - Disable separate layouts per window

[Bastien Nocera]

commit 8780592a973936acbaf5f2a4db83a93fd91c8643
Author: Bastien Nocera <hadess at hadess.net>
Date:   Thu Feb 3 15:02:44 2011 +0000

    - Disable separate layouts per window

 0001-Don-t-use-different-layouts-per-window.patch |   34 +++++++++++++++++++
 buildfix.patch                                    |   12 -------
 dd12792ee893440aa0bc31f3dc8eb2e8996715f5.patch    |   36 ---------------------
 libgnomekbd.spec                                  |    7 +++-
 pc-fix.patch                                      |   11 ------
 5 files changed, 40 insertions(+), 60 deletions(-)
---
diff --git a/0001-Don-t-use-different-layouts-per-window.patch b/0001-Don-t-use-different-layouts-per-window.patch
new file mode 100644
index 0000000..289df34
--- /dev/null
+++ b/0001-Don-t-use-different-layouts-per-window.patch
@@ -0,0 +1,34 @@
+From 31c922e6eea3047b784a1f95132d044f3dab58c9 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Thu, 3 Feb 2011 14:54:07 +0000
+Subject: [PATCH] Don't use different layouts per window
+
+Using different layouts per-window is confusing for new users. Both
+Windows and MacOS X default to using the same layout globally, and
+just like them, we offer a graphical way to change the layout (through
+a system icon).
+
+Once the user gains profiency in switching layouts, we can offer them
+a more complicated way, using separate layouts for each window.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=641351
+---
+ ...org.gnome.libgnomekbd.desktop.gschema.xml.in.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in b/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in
+index 7be778d..6f42fd7 100644
+--- a/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in
++++ b/libgnomekbd/org.gnome.libgnomekbd.desktop.gschema.xml.in.in
+@@ -7,7 +7,7 @@
+       <_description>Default group, assigned on window creation</_description>
+     </key>
+     <key name="group-per-window" type="b">
+-      <default>true</default>
++      <default>false</default>
+       <_summary>Keep and manage separate group per window</_summary>
+       <_description>Keep and manage separate group per window</_description>
+     </key>
+-- 
+1.7.4
+
diff --git a/libgnomekbd.spec b/libgnomekbd.spec
index 7b0a939..8807c40 100644
--- a/libgnomekbd.spec
+++ b/libgnomekbd.spec
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
 Version:        2.91.5
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -22,6 +22,8 @@ BuildRequires:  gobject-introspection-devel
 Requires(post): GConf2
 
 Patch0: fix-error-at-login-screen.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=641351
+Patch1: 0001-Don-t-use-different-layouts-per-window.patch
 
 %description
 The libgnomekbd package contains a GNOME library which manages
@@ -117,6 +119,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Thu Feb 03 2011 Bastien Nocera <bnocera at redhat.com> 2.91.5-7
+- Disable separate layouts per window
+
 * Wed Feb 02 2011 Ray Strode <rstrode at redhat.com> 2.91.5-6
 - Fix error at login screen