Commit 9a509657 authored by Stephan Arts's avatar Stephan Arts

Fix libxklavier API breakage

parent 53c7e739
......@@ -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 ***
......
......@@ -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) \
......
......@@ -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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment