[Xfce4-commits] <xfce4-settings:master> Fix libxklavier API breakage

[Stephan Arts]

Updating branch refs/heads/master
         to 9a5096571c3e2fbe74e2ad8f7a89348c41cffef1 (commit)
       from 53c7e73900bdcec6ad8be2c9255d61fe9da6b4c9 (commit)

commit 9a5096571c3e2fbe74e2ad8f7a89348c41cffef1
Author: Stephan Arts <stephan at xfce.org>
Date:   Tue Sep 29 01:14:50 2009 +0200

    Fix libxklavier API breakage

 configure.ac.in                                    |    2 ++
 dialogs/keyboard-settings/Makefile.am              |    2 ++
 dialogs/keyboard-settings/xfce-keyboard-settings.c |    4 ++++
 3 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index c71f424..1dd7626 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -135,6 +135,8 @@ dnl *** Optional support for Libxklavier ***
 dnl ****************************************
 XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER], [libxklavier], [0.3.0],
                            [libxklavier], [Keyboard layout selection])
+XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER4], [libxklavier], [4.0],
+                           [libxklavier], [Keyboard layout selection])
 
 dnl ************************************
 dnl *** Xsettings daemon is optional ***
diff --git a/dialogs/keyboard-settings/Makefile.am b/dialogs/keyboard-settings/Makefile.am
index 85046c7..f72e7f5 100644
--- a/dialogs/keyboard-settings/Makefile.am
+++ b/dialogs/keyboard-settings/Makefile.am
@@ -23,6 +23,7 @@ xfce4_keyboard_settings_SOURCES = \
 xfce4_keyboard_settings_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(LIBXKLAVIER_CFLAGS) \
+	$(LIBXKLAVIER_0_4_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
 	$(LIBXFCE4KBD_PRIVATE_CFLAGS) \
@@ -37,6 +38,7 @@ xfce4_keyboard_settings_LDFLAGS = \
 xfce4_keyboard_settings_LDADD = \
 	$(GTK_LIBS) \
 	$(LIBXKLAVIER_LIBS) \
+	$(LIBXKLAVIER_0_4_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(LIBXFCE4UI_LIBS) \
 	$(LIBXFCE4KBD_PRIVATE_LIBS) \
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index ddecc11..d4d07fe 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -316,7 +316,11 @@ xfce_keyboard_settings_constructed (GObject *object)
   xkl_config_rec_get_from_server (settings->priv->xkl_rec_config, settings->priv->xkl_engine);
 
   settings->priv->xkl_registry = xkl_config_registry_get_instance (settings->priv->xkl_engine);
+#ifdef HAVE_LIBXKLAVIER4
+  xkl_config_registry_load (settings->priv->xkl_registry, FALSE);
+#else
   xkl_config_registry_load (settings->priv->xkl_registry);
+#endif
 
   /* Tab */
   xkb_tab_layout_vbox = gtk_builder_get_object (GTK_BUILDER (settings), "xkb_tab_layout_vbox");