rpms/gnome-settings-daemon/devel xklavier4.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.107, 1.108

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	xklavier4.patch 
Log Message:
fix for xklavier api changes


xklavier4.patch:

--- NEW FILE xklavier4.patch ---
diff -up gnome-settings-daemon-2.27.3/plugins/keyboard/gsd-keyboard-xkb.c.xklavier4 gnome-settings-daemon-2.27.3/plugins/keyboard/gsd-keyboard-xkb.c
--- gnome-settings-daemon-2.27.3/plugins/keyboard/gsd-keyboard-xkb.c.xklavier4	2009-07-01 09:19:26.936571862 -0400
+++ gnome-settings-daemon-2.27.3/plugins/keyboard/gsd-keyboard-xkb.c	2009-07-01 09:32:19.620817134 -0400
@@ -168,7 +168,7 @@ filter_xkb_config (void)
 	xkl_debug (100, "Filtering configuration against the registry\n");
 	if (!xkl_registry) {
 		xkl_registry = xkl_config_registry_get_instance (xkl_engine);
-		if (!xkl_config_registry_load (xkl_registry)) {
+		if (!xkl_config_registry_load (xkl_registry, FALSE)) {
 			g_object_unref (xkl_registry);
 			xkl_registry = NULL;
 			return FALSE;


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- gnome-settings-daemon.spec	30 Jun 2009 20:34:12 -0000	1.107
+++ gnome-settings-daemon.spec	1 Jul 2009 13:45:03 -0000	1.108
@@ -38,6 +38,8 @@ Patch11:	gnome-settings-daemon-2.26.0-su
 # https://bugzilla.redhat.com/show_bug.cgi?id=483639
 Patch12:	gnome-settings-daemon-2.26.1-fix-touchpad.patch
 
+Patch13:	xklavier4.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.
@@ -58,6 +60,7 @@ developing applications that use %{name}
 
 %patch11 -p1 -b .support-touchpads
 %patch12 -p1 -b .lefthand-touchpad
+%patch13 -p1 -b .xklavier4
 
 autoreconf -i -f