Updating branch refs/heads/4.10_panel_support to c68e88ca7419a2010e0574f731555dc6652a8acf (commit) from a9e10fe8455da12ff73c787d3a7d758cddc86b48 (commit)
commit c68e88ca7419a2010e0574f731555dc6652a8acf Author: Igor Slepchin <igor.slepc...@gmail.com> Date: Fri Jun 7 16:38:19 2013 -0400 Don't do anything fancy on panel's save signal I.e., just save the current config, don't re-activate/reset XKB settings. This should take care of bug 10152. panel-plugin/xfce4-xkb-plugin.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/panel-plugin/xfce4-xkb-plugin.c b/panel-plugin/xfce4-xkb-plugin.c index 037102b..914b61e 100644 --- a/panel-plugin/xfce4-xkb-plugin.c +++ b/panel-plugin/xfce4-xkb-plugin.c @@ -252,8 +252,7 @@ xfce_xkb_save_config (XfcePanelPlugin *plugin, t_xkb *xkb) gchar* filename; XfceRc* rcfile; - xkb_config_update_settings (xkb->settings); - xkb_initialize_menu (xkb); + TRACE (" "); filename = xfce_panel_plugin_save_location (plugin, TRUE); if (!filename) @@ -400,6 +399,8 @@ xkb_initialize_menu (t_xkb *xkb) GtkWidget *image; GtkWidget *menu_item; + TRACE (" "); + if (G_UNLIKELY (xkb == NULL)) return; if (xkb->popup) _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits