rpms/gnome-settings-daemon/F-11 gsd-xkb-init.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.102, 1.103

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23093

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	gsd-xkb-init.patch 
Log Message:
Don't rely on _BACKUP property for xkb initialization


gsd-xkb-init.patch:

--- NEW FILE gsd-xkb-init.patch ---
diff -up gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c.xkb-init gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c
--- gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c.xkb-init	2009-04-29 21:42:13.873737299 -0400
+++ gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c	2009-04-29 21:42:23.752987998 -0400
@@ -234,7 +234,7 @@ gsd_keyboard_xkb_analyze_sysconfig (void
 	conf_client = gconf_client_get_default ();
 	gkbd_keyboard_config_init (&initial_sys_kbd_config,
 				   conf_client, xkl_engine);
-	gkbd_keyboard_config_load_from_x_initial (&initial_sys_kbd_config,
+	gkbd_keyboard_config_load_from_x_current (&initial_sys_kbd_config,
 						  NULL);
 	g_object_unref (conf_client);
 }


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-11/gnome-settings-daemon.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- gnome-settings-daemon.spec	29 Apr 2009 18:32:02 -0000	1.102
+++ gnome-settings-daemon.spec	30 Apr 2009 02:17:13 -0000	1.103
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.26.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -44,6 +44,8 @@ Patch12:	gnome-settings-daemon-2.26.1-fi
 # http://bugzilla.gnome.org/show_bug.cgi?id=580616
 Patch13:	compare-keys-carefully.patch
 
+Patch14:	gsd-xkb-init.patch
+
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -66,6 +68,7 @@ developing applications that use %{name}
 %patch11 -p1 -b .support-touchpads
 %patch12 -p1 -b .lefthand-touchpad
 %patch13 -p1 -b .compare-keys-carefully
+%patch14 -p1 -b .xkb-init
 
 autoreconf -i -f
 
@@ -178,6 +181,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Apr 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.1-4
+- Don't rely on _BACKUP property for xkb initialization
+
 * Wed Apr 29 2009 Matthias Clasen  <mclasen at redhat.com> - 2.26.1-3
 - Make custom keybindings work better (#497725)