fix for xklavier api changes

This commit is contained in:
Matthias Clasen 2009-07-01 13:45:03 +00:00
parent 19223a9147
commit 789d4df7c8
2 changed files with 15 additions and 0 deletions

View File

@ -38,6 +38,8 @@ Patch11: gnome-settings-daemon-2.26.0-support-touchpads.patch
# 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

12
xklavier4.patch Normal file
View File

@ -0,0 +1,12 @@
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;