aboutsummaryrefslogtreecommitdiff
path: root/lib/main.vala
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2014-04-05 00:26:33 +1300
committerWilliam Hua <william.hua@canonical.com>2014-04-05 00:26:33 +1300
commit969e5b55bebc4507d694b0075667c36850ea7025 (patch)
tree363bcea40f75437c92619889347a18f80294a0b5 /lib/main.vala
parentef122381c53550ba4e0512e28f6b12386772f34b (diff)
downloadayatana-indicator-keyboard-969e5b55bebc4507d694b0075667c36850ea7025.tar.gz
ayatana-indicator-keyboard-969e5b55bebc4507d694b0075667c36850ea7025.tar.bz2
ayatana-indicator-keyboard-969e5b55bebc4507d694b0075667c36850ea7025.zip
Remember to reset the indicator icon on unlock too.
Diffstat (limited to 'lib/main.vala')
-rw-r--r--lib/main.vala11
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/main.vala b/lib/main.vala
index dde166f6..bcf23209 100644
--- a/lib/main.vala
+++ b/lib/main.vala
@@ -984,16 +984,7 @@ public class Indicator.Keyboard.Service : Object {
}
});
((!) unity_session).unlocked.connect (() => {
- if (keyboard_plugin != null) {
- var current = source_settings.get_uint ("current");
-
- try {
- /* Always restore session input source on unlock. */
- ((!) keyboard_plugin).activate_input_source (current);
- } catch (IOError error) {
- warning ("error: %s", error.message);
- }
- }
+ get_active_action ().change_state (source_settings.get_value ("current"));
});
} catch (IOError error) {
warning ("error: %s", error.message);