[Xfce4-commits] <xfce4-settings:xfce-4.6> Port to libxklavier 5.0 API.

[Jérôme Guelfucci]

Updating branch refs/heads/xfce-4.6
         to 72d9c3e2e10aa4fed1d133df09f0adcfbcbce56f (commit)
       from b701fe0827fb71a82f7c08c8b60b2a253a2e8aaa (commit)

commit 72d9c3e2e10aa4fed1d133df09f0adcfbcbce56f
Author: Lionel Le Folgoc <mrpouit at ubuntu.com>
Date:   Mon Jan 25 22:36:32 2010 +0100

    Port to libxklavier 5.0 API.

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

diff --git a/configure.ac.in b/configure.ac.in
index 4bb52df..19aabcb 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -111,6 +111,8 @@ 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])
+XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER5], [libxklavier], [5.0],
+                           [libxklavier], [Keyboard layout selection])
 
 dnl ************************************
 dnl *** Xsettings daemon is optional ***
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index 13d83be..95d1932 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -457,7 +457,11 @@ xfce_keyboard_settings_finalize (GObject *object)
 
 #ifdef HAVE_LIBXKLAVIER
   /* Stop xklavier engine */
+#ifdef HAVE_LIBXKLAVIER5
+  xkl_engine_stop_listen (settings->priv->xkl_engine, XKLL_TRACK_KEYBOARD_STATE);
+#else
   xkl_engine_stop_listen (settings->priv->xkl_engine);
+#endif /* HAVE_LIBXKLAVIER5 */
 #endif /* HAVE_LIBXKLAVIER */
 
   g_object_unref (settings->priv->provider);