Updating branch refs/heads/4.10_panel_support to feac42fd57d75680f1dfbdfc9142c859cbd01735 (commit) from 93f3b95ec40fef08f96920d1ef0924c8891c608e (commit)
commit feac42fd57d75680f1dfbdfc9142c859cbd01735 Author: Igor Slepchin <igor.slepc...@gmail.com> Date: Sat Mar 30 02:30:19 2013 -0400 Never pass NULL as keyboard model to xklavier Otherwise, the call to XkbRF_GetComponents will fail later on and activating the new xkb settings will fail too. panel-plugin/xkb-config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c index 13656bd..23353c2 100644 --- a/panel-plugin/xkb-config.c +++ b/panel-plugin/xkb-config.c @@ -346,7 +346,7 @@ xkb_config_update_settings (t_xkb_settings *settings) activate_settings = TRUE; g_free (config->config_rec->model); - config->config_rec->model = g_strdup (settings->kbd_config->model); + config->config_rec->model = g_strdup (settings->kbd_config->model ? settings->kbd_config->model : ""); g_strfreev (config->config_rec->layouts); config->config_rec->layouts = g_strsplit_set (settings->kbd_config->layouts, ",", 0); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits