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

[Gunnar Hjalmarsson]

Hi Laney,

I have tested (by faking Japanese first logins) the idea to call add_ibus_sources_from_locale() from maybe_convert_old_settings(). This is where I put it:

        if (g_variant_n_children (sources) < 1) {
                convert_libgnomekbd_layouts (settings);
                add_ibus_sources_from_locale (settings);
        }

convert_libgnomekbd_layouts() seems to not have changed anything, but Mozc was added. However, it resulted in a session with only Mozc available in sources. The reason is that the get_sources_from_xkb_config() call in maybe_create_initial_settings() did not happen since sources wasn't empty at that spot in the flow.

I don't know if it would be acceptable to not have a XKB layout available, but I have my doubts. In any case I feel that such a change would be too intrusive considering that I want to SRU to bionic whatever solution we choose.

Furthermore, to address the bug happening when you "Try Ubuntu" from the Ubiquity welcome screen, I suspect that the call would need to be moved beyond the condition, like this:

        if (g_variant_n_children (sources) < 1) {
                convert_libgnomekbd_layouts (settings);
        }
        add_ibus_sources_from_locale (settings);

But that would also result in real installs with only an IBus input method in sources.

My conclusion is that any call of add_ibus_sources_from_locale() from maybe_convert_old_settings() would be premature.

So I'm back to my proposal in this MP. It lets g-s-d do its things with respect to XKB layouts first, and then it adds an IBus method if applicable. Even if there are a few lines, the regression risk ought to be minimal.
-- 
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.