[Merge] ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master

[Gunnar Hjalmarsson]

An attempt to summarize:

1. get_sources_from_xkb_config() needs to be called if no XKB layouts were added previously.

2. add_ibus_sources_from_locale() needs to be run once regardless.

To meet both those conditions, you cannot call add_ibus_sources_from_locale() from maybe_convert_old_settings().
-- 
https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/368409
Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/master.