diff options
| author | fujiwarat <takao.fujiwara1@gmail.com> | 2013-03-07 13:16:10 +0900 |
|---|---|---|
| committer | fujiwarat <takao.fujiwara1@gmail.com> | 2013-03-07 13:16:10 +0900 |
| commit | 5fa461889939a91fecff89a67630076b8cb987b2 (patch) | |
| tree | 1a25e77bf36eac56ba2563c929c5f053fd18b034 /ui | |
| parent | 4b2f6a477019b50375aba2e5f9c43e618b6905ad (diff) | |
Change set_use_system_keyboard_layout() timing.
Call set_use_system_keyboard_layout() before update_engines() is called
in panel.vala because update_engines() calls switch_engine().
BUG=http://code.google.com/p/ibus/issues/detail?id=1558#c43
Review URL: https://codereview.appspot.com/7559043
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk3/panel.vala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala index 9f6e5e37..18ef5c09 100644 --- a/ui/gtk3/panel.vala +++ b/ui/gtk3/panel.vala @@ -299,12 +299,14 @@ class Panel : IBus.PanelService { m_config.watch("general/hotkey", "triggers"); m_config.watch("panel", "custom_font"); m_config.watch("panel", "use_custom_font"); + // Update m_use_system_keyboard_layout before update_engines() + // is called. + set_use_system_keyboard_layout(null); update_engines(m_config.get_value("general", "preload_engines"), m_config.get_value("general", "engines_order")); unbind_switch_shortcut(); bind_switch_shortcut(null); set_switcher_delay_time(null); - set_use_system_keyboard_layout(null); } else { update_engines(null, null); } |