OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=67

gdm-always-reflect-keyboard-layout.patch

@@ -0,0 +1,15 @@
+diff --git a/gui/simple-greeter/gdm-option-widget.c b/gui/simple-greeter/gdm-option-widget.c
+index b3c37aa..e694056 100644
+--- a/gui/simple-greeter/gdm-option-widget.c
++++ b/gui/simple-greeter/gdm-option-widget.c
+@@ -534,10 +534,6 @@ static void
+ on_changed (GtkComboBox     *combo_box,
+             GdmOptionWidget *widget)
+ {
+-        if (widget->priv->default_item_id == NULL) {
+-                return;
+-        }
+-
+         activate_selected_item (widget);
+ }
+ 

gdm.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 21 01:57:52 CST 2008 - hpj@novell.com
+
+- Add gdm-always-reflect-keyboard-layout.patch (bnc#438159).
+
 -------------------------------------------------------------------
 Thu Nov 20 01:29:42 CST 2008 - hpj@novell.com
 

gdm.spec

@@ -57,7 +57,7 @@ PreReq:         %insserv_prereq
 License:        GPL v2 or later
 Group:          System/GUI/GNOME
 Version:        2.24.0
-Release:        11
+Release:        12
 Summary:        The GNOME 2.x Display Manager
 Source:         %{name}-%{version}.tar.bz2
 Source1:        gdm.pamd
@@ -93,6 +93,8 @@ Patch15:        gdm-greeter-greater-ui.patch
 Patch16:        gdm-fix-xdmcp.patch
 # PATCH-FIX-UPSTREAM gdm-fix-pam-auditing.patch bnc436852 bgo557794 hpj@novell.com -- Make PAM auditing work on logout.
 Patch17:        gdm-fix-pam-auditing.patch
+# PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations.
+Patch18:        gdm-always-reflect-keyboard-layout.patch
 Patch28:        gdm-X_SERVER.patch
 # PATCH-SUSE: enable SELinux
 Patch60:        gdm-selinux.patch
@@ -172,6 +174,7 @@ Authors:
 %patch15 -p1
 %patch16 -p1
 %patch17 -p0
+%patch18 -p1
 %patch28
 %patch60
 
@@ -280,6 +283,8 @@ fi
 %files lang -f %{name}.lang
 
 %changelog
+* Fri Nov 21 2008 hpj@novell.com
+- Add gdm-always-reflect-keyboard-layout.patch (bnc#438159).
 * Thu Nov 20 2008 hpj@novell.com
 - Add gdm-fix-xdmcp.patch, which makes XDMCP work (bnc#441396).
 - Add gdm-fix-pam-auditing.patch, which makes PAM auditing work