From ee934ea482a88af21a6b80aadf9cce96b80ca0fb Mon Sep 17 00:00:00 2001 From: Lionel Le Folgoc Date: Mon, 25 Jan 2010 22:36:32 +0100 Subject: [PATCH] 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 a3d4c4c..c583153 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -137,6 +137,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 631dc69..5ff7ae3 100644 --- a/dialogs/keyboard-settings/xfce-keyboard-settings.c +++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c @@ -395,7 +395,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 (G_OBJECT (settings->priv->provider)); -- 1.6.3.3