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

[Stephan Arts]

Updating branch refs/heads/xfce-4.6
         to f79784cce666abf810265747f1ab5f049cec2bd4 (commit)
       from 1772fa93f05331c040d4afded8d615f303a12e7a (commit)

commit f79784cce666abf810265747f1ab5f049cec2bd4
Author: Stephan Arts <stephan at xfce.org>
Date:   Mon Sep 28 23:00:28 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 38c0070..0114194 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -109,6 +109,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 7bc7cbd..11c4ce1 100644
--- a/dialogs/keyboard-settings/Makefile.am
+++ b/dialogs/keyboard-settings/Makefile.am
@@ -26,6 +26,7 @@ xfce4_keyboard_settings_CFLAGS = \
 	$(GLADE_CFLAGS) \
 	$(DBUS_GLIB_CFLAGS) \
 	$(LIBXKLAVIER_CFLAGS) \
+	$(LIBXKLAVIER_0_4_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCEGUI4_CFLAGS) \
 	$(LIBXFCE4KBD_PRIVATE_CFLAGS) \
@@ -42,6 +43,7 @@ xfce4_keyboard_settings_LDADD = \
 	$(GLADE_LIBS) \
 	$(DBUS_GLIB_LIBS) \
 	$(LIBXKLAVIER_LIBS) \
+	$(LIBXKLAVIER_0_4_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(LIBXFCEGUI4_LIBS) \
 	$(LIBXFCE4KBD_PRIVATE_LIBS) \
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index d1cb69c..fe8251f 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -378,7 +378,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 = glade_xml_get_widget (settings->priv->glade_xml, "xkb_tab_layout_vbox");