From d82376b7fbe6f1f91a3a7cd50134fc6304eed59f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 8 Feb 2008 03:54:28 +0000 Subject: [PATCH] fix keyboard layout loading --- gnome-settings-daemon.spec | 8 +++++++- load-xkb.patch | 11 +++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 load-xkb.patch diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index f588aac..ad8518f 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,6 +1,6 @@ Name: gnome-settings-daemon Version: 2.21.90.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons @@ -30,6 +30,8 @@ BuildRequires: gettext BuildRequires: perl(XML::Parser) Patch0: gsd-path-fix.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=511771 +Patch1: load-xkb.patch %description A daemon to share settings from GNOME to other applications. It also @@ -49,6 +51,7 @@ developing applications that use %{name}. %prep %setup -q %patch0 -p1 -b .path +%patch1 -p1 -b .load-xkb %build %configure --enable-static=no @@ -114,6 +117,9 @@ fi %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Thu Feb 7 2008 Matthias Clasen - 2.21.90.1-3 +- Load xkb settings initially + * Thu Jan 31 2008 - Bastien Nocera - 2.21.90.1-2 - Fix the path for g-s-d, from upstream patch diff --git a/load-xkb.patch b/load-xkb.patch new file mode 100644 index 0000000..90698fd --- /dev/null +++ b/load-xkb.patch @@ -0,0 +1,11 @@ +diff -up gnome-settings-daemon-2.21.90.1/plugins/keyboard/gsd-keyboard-manager.c.load-xkb gnome-settings-daemon-2.21.90.1/plugins/keyboard/gsd-keyboard-manager.c +--- gnome-settings-daemon-2.21.90.1/plugins/keyboard/gsd-keyboard-manager.c.load-xkb 2008-02-07 22:49:45.000000000 -0500 ++++ gnome-settings-daemon-2.21.90.1/plugins/keyboard/gsd-keyboard-manager.c 2008-02-07 22:49:57.000000000 -0500 +@@ -410,6 +410,7 @@ gsd_keyboard_manager_start (GsdKeyboardM + /* Essential - xkb initialization should happen before */ + gsd_keyboard_xkb_set_post_activation_callback ((PostActivationCallback) gsd_load_modmap_files, NULL); + gsd_keyboard_xkb_init (client); ++ gsd_keyboard_xkb_load (client); + + register_config_callback (manager, + GSD_KEYBOARD_KEY,