diff -p -up xfce4-xkb-plugin-0.5.3.3/configure.in.libxklavier4.0 xfce4-xkb-plugin-0.5.3.3/configure.in --- xfce4-xkb-plugin-0.5.3.3/configure.in.libxklavier4.0 2009-03-06 14:16:22.000000000 +0100 +++ xfce4-xkb-plugin-0.5.3.3/configure.in 2010-01-11 14:34:21.000000000 +0100 @@ -65,7 +65,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2. XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2]) XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2]) XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20]) -XDT_CHECK_PACKAGE([LIBXKLAVIER], [libxklavier], [3.2]) +XDT_CHECK_PACKAGE([LIBXKLAVIER], [libxklavier], [4.0]) XDT_CHECK_PACKAGE([LIBRSVG], [librsvg-2.0], [2.18]) XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12]) diff -p -up xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c.libxklavier4.0 xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c --- xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c.libxklavier4.0 2009-03-06 14:16:03.000000000 +0100 +++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2010-01-11 14:38:13.000000000 +0100 @@ -150,7 +150,7 @@ xkb_config_initialize_xkb_options (t_xkb config->application_map = g_hash_table_new (g_direct_hash, NULL); registry = xkl_config_registry_get_instance (config->engine); - xkl_config_registry_load (registry); + xkl_config_registry_load (registry, TRUE); config_item = xkl_config_item_new (); @@ -214,7 +214,8 @@ xkb_config_finalize () gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL); - xkl_engine_stop_listen (config->engine); + xkl_engine_stop_listen (config->engine, XKLL_MANAGE_LAYOUTS | + XKLL_MANAGE_WINDOW_STATES); } gint @@ -547,7 +548,7 @@ xkb_config_get_xkl_registry () if (!config) return NULL; registry = xkl_config_registry_get_instance (config->engine); - xkl_config_registry_load (registry); + xkl_config_registry_load (registry, TRUE); return registry; }