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

[Iain Lane]

Come on, you can think of ways around this! A couple of ideas, but there are probably more:

  - Make maybe_convert_old_settings() return a boolean to indicate if it ran or exited due to the stamp file. If it ran, then call add_ibus_sources_from_locale() later on.
  - Make it return the number of items in KEY_INPUT_SOURCES *before* it calls add_ibus_sources_from_locale(), and then use that later on instead of reading it fresh.
-- 
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.