Updating branch refs/heads/master to 856114644ea975b7c6a68337ce46083c47efa863 (commit) from 3afbb0e99e037ac4f9d2358e58b4f058f6e3680c (commit)
commit 856114644ea975b7c6a68337ce46083c47efa863 Author: Azamat H. Hackimov <azamat.hacki...@gmail.com> Date: Sat Feb 19 02:36:49 2011 +0500 Fix compilation with libxklavier 5.0 (bug #6221). Thank to Samuli Suominen for patch. panel-plugin/xkb-config.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c index 352fdf1..fbda374 100644 --- a/panel-plugin/xkb-config.c +++ b/panel-plugin/xkb-config.c @@ -150,7 +150,7 @@ xkb_config_initialize_xkb_options (t_xkb_settings *settings) 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, FALSE); config_item = xkl_config_item_new (); @@ -214,7 +214,7 @@ 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_TRACK_KEYBOARD_STATE); } gint @@ -547,7 +547,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, FALSE); return registry; } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits