From 90267c7f7afc73b27193632ec4af2c5360fab85a Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Tue, 21 Jul 2009 00:56:37 +0200 Subject: [PATCH] Add support for libxklavier-4 --- configure.ac | 10 +++++++--- gui/simple-greeter/gdm-layouts.c | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d4a44d5..068e45c 100644 --- a/configure.ac +++ b/configure.ac @@ -114,9 +114,13 @@ AC_ARG_ENABLE([libxklavier], have_libxklavier=no if test "x$enable_libxklavier" = "xyes"; then PKG_CHECK_MODULES(LIBXKLAVIER, - libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION, - have_libxklavier=yes, - have_libxklavier=no) + libxklavier >= 4, + [AC_DEFINE(HAVE_XKL_4, [1], [lixklavier-4 support]) + have_libxklavier=yes], + [PKG_CHECK_MODULES(LIBXKLAVIER, + libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION, + have_libxklavier=yes, + have_libxklavier=no)]) if test "x$have_libxklavier" = "xyes" ; then AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier]) fi diff --git a/gui/simple-greeter/gdm-layouts.c b/gui/simple-greeter/gdm-layouts.c index dc35094..97e1e08 100644 --- a/gui/simple-greeter/gdm-layouts.c +++ b/gui/simple-greeter/gdm-layouts.c @@ -52,7 +52,11 @@ init_xkl (void) engine = xkl_engine_get_instance (GDK_DISPLAY ()); xkl_engine_backup_names_prop (engine); config_registry = xkl_config_registry_get_instance (engine); +#if HAVE_XKL_4 + xkl_config_registry_load (config_registry, FALSE); +#else xkl_config_registry_load (config_registry); +#endif initial_config = xkl_config_rec_new (); if (!xkl_config_rec_get_from_backup (initial_config, engine)) { -- 1.6.3.3