[gnome-settings-daemon] Depend on libxklavier 4.0

[Sergey V. Udaltsov <svu src gnome org>]

commit 77c3693680d94f3f73276698604675dafdc0f97e
Author: Sergey V. Udaltsov <svu gnome org>
Date:   Wed Jul 1 16:13:50 2009 +0100

    Depend on libxklavier 4.0
    
    The API was changed, all related gnome modules updated

 ChangeLog                           |    5 +++++
 configure.ac                        |    2 +-
 plugins/keyboard/gsd-keyboard-xkb.c |    3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index af2da7a..8ca3bbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-01  Sergey Udaltsov <svu gnome org>
+
+	* configure.ac, plugins/keyboard/gsd-keyboard-xkb.c: depend on
+	libxklavier 4.0, updated API
+
 2009-06-01  Jens Granseuer  <jensgr gmx net>
 
 	* plugins/housekeeping/gsd-disk-space.c: include config.h so the
diff --git a/configure.ac b/configure.ac
index 921dea1..16a33cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,7 +218,7 @@ AC_CHECK_X_LIB(Xxf86misc, XF86MiscQueryExtension, [
 AC_SUBST(XF86MISC_LIBS)
 AC_CHECK_X_HEADERS([X11/extensions/XKB.h])
 
-PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21.4 libxklavier >= 3.8])
+PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21.4 libxklavier >= 4.0])
 AC_SUBST(LIBGNOMEKBD_CFLAGS)
 AC_SUBST(LIBGNOMEKBD_LIBS)
 
diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c
index 86b5ea8..60495dc 100644
--- a/plugins/keyboard/gsd-keyboard-xkb.c
+++ b/plugins/keyboard/gsd-keyboard-xkb.c
@@ -168,7 +168,8 @@ 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)) {
+		/* load all materials, unconditionally! */
+		if (!xkl_config_registry_load (xkl_registry, TRUE)) {
 			g_object_unref (xkl_registry);
 			xkl_registry = NULL;
 			return FALSE;