rpms/gnome-settings-daemon/devel load-xkb.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.5, 1.6

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-settings-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25472

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	load-xkb.patch 
Log Message:
fix keyboard layout loading


load-xkb.patch:

--- NEW FILE load-xkb.patch ---
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,


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-settings-daemon.spec	31 Jan 2008 10:51:41 -0000	1.5
+++ gnome-settings-daemon.spec	8 Feb 2008 03:54:28 -0000	1.6
@@ -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:	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 @@
 %prep
 %setup -q
 %patch0 -p1 -b .path
+%patch1 -p1 -b .load-xkb
 
 %build
 %configure --enable-static=no
@@ -114,6 +117,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Thu Feb  7 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.90.1-3
+- Load xkb settings initially
+
 * Thu Jan 31 2008 - Bastien Nocera <bnocera at redhat.com> - 2.21.90.1-2
 - Fix the path for g-s-d, from upstream patch