Updating branch refs/heads/4.10_panel_support
to eb9727605d273572f03509a5c74c2d47fca6e6a7 (commit)
from 264ff9a488c5d4ddfabe6d954e509dd42301cf63 (commit)
commit eb9727605d273572f03509a5c74c2d47fca6e6a7
Author: Igor Slepchin <igor.slepc...@gmail.com>
Date: Mon Jul 23 14:34:40 2012 -0400
Reset the current group to 0 whenever config change is detected.
This avoids some weirdness when the layout change causes the current
group to change/disappear. Besides, we're resetting the rest of
the settings anyway.
(cherry picked from commit d7490a02ab8cd69a6e161e160f76adc2a600105e)
panel-plugin/xkb-config.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index 2c5af77..b2199b7 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -570,7 +570,10 @@ xkb_config_xkl_config_changed (XklEngine *engine)
xkb_config_update_settings (config->settings);
if (config->callback != NULL)
- config->callback (xkb_config_get_current_group (), TRUE,
config->callback_data);
+ {
+ xkb_config_set_group (0);
+ config->callback (0, TRUE, config->callback_data);
+ }
}
gint
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
