Gunnar Hjalmarsson has proposed merging ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session_bionic into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic.
Commit message: Enable IBus IM in live session (LP: #1786344) Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1786344 in gnome-settings-daemon (Ubuntu): "Default IBus input method ignored in live session" https://bugs.launchpad.net/ubuntu/+source/gnome-settings-daemon/+bug/1786344 For more details, see: https://code.launchpad.net/~gunnarhj/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/369154 I have tested the daily build ISO from this morning UTC. The issue was resolved as expected. So this MP is the bionic equivalent to this upload: https://launchpad.net/ubuntu/+source/gnome-settings-daemon/3.32.1-1ubuntu2 The branch successfully built in PPA: https://launchpad.net/~gunnarhj/+archive/ubuntu/gnome-settings-daemon -- Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/gnome-settings-daemon:ibus-live-session_bionic into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog index 04e625e..c321c66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +gnome-settings-daemon (3.28.1-0ubuntu1.3) bionic; urgency=medium + + * debian/patches/ubuntu_ibus_configs.patch: + - Always call add_ibus_sources_from_locale() during the first run + of g-s-d. This ensures that an IBus method is included in "live + sessions" when applicable (LP: #1786344). + * debian/patches/keyboard-Enable-ibus-for-OSK-purposes.patch: + - Refreshed + + -- Gunnar Hjalmarsson <[email protected]> Fri, 21 Jun 2019 11:58:00 +0200 + gnome-settings-daemon (3.28.1-0ubuntu1.2) bionic; urgency=medium * debian/patches/keyboard-Enable-ibus-for-OSK-purposes.patch: diff --git a/debian/patches/keyboard-Enable-ibus-for-OSK-purposes.patch b/debian/patches/keyboard-Enable-ibus-for-OSK-purposes.patch index 6a76d1b..a0c2efd 100644 --- a/debian/patches/keyboard-Enable-ibus-for-OSK-purposes.patch +++ b/debian/patches/keyboard-Enable-ibus-for-OSK-purposes.patch @@ -166,7 +166,7 @@ index 343b049..480e735 100644 } static void -@@ -812,8 +859,15 @@ start_keyboard_idle_cb (GsdKeyboardManager *manager) +@@ -818,8 +865,15 @@ start_keyboard_idle_cb (GsdKeyboardManager *manager) set_devicepresence_handler (manager); manager->priv->input_sources_settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR); @@ -184,7 +184,7 @@ index 343b049..480e735 100644 manager->priv->cancellable = g_cancellable_new (); -@@ -876,10 +930,12 @@ gsd_keyboard_manager_stop (GsdKeyboardManager *manager) +@@ -882,10 +936,12 @@ gsd_keyboard_manager_stop (GsdKeyboardManager *manager) g_clear_object (&p->settings); g_clear_object (&p->input_sources_settings); diff --git a/debian/patches/ubuntu_ibus_configs.patch b/debian/patches/ubuntu_ibus_configs.patch index 5b9212a..e731a3e 100644 --- a/debian/patches/ubuntu_ibus_configs.patch +++ b/debian/patches/ubuntu_ibus_configs.patch @@ -3,8 +3,8 @@ Description: restore the code that configure the input method according to Bug: https://bugs.launchpad.net/bugs/1719938 Forwarded: not-needed --- - plugins/keyboard/gsd-keyboard-manager.c | 53 +++++++++++++++++++++++++++++++++ - 1 file changed, 53 insertions(+) + plugins/keyboard/gsd-keyboard-manager.c | 64 +++++++++++++++++++++++- + 1 file changed, 62 insertions(+), 2 deletions(-) Index: gnome-settings-daemon-3.26.1/plugins/keyboard/gsd-keyboard-manager.c =================================================================== @@ -69,15 +69,57 @@ Index: gnome-settings-daemon-3.26.1/plugins/keyboard/gsd-keyboard-manager.c static void xkb_init (GsdKeyboardManager *manager) { -@@ -711,8 +763,10 @@ maybe_create_initial_settings (GsdKeyboa +@@ -656,7 +708,7 @@ convert_libgnomekbd_layouts (GSettings *settings) + g_object_unref (libgnomekbd_settings); + } + +-static void ++static gboolean + maybe_convert_old_settings (GSettings *settings) + { + GVariant *sources; +@@ -664,6 +716,7 @@ maybe_convert_old_settings (GSettings *settings) + gchar *stamp_dir_path = NULL; + gchar *stamp_file_path = NULL; + GError *error = NULL; ++ gboolean is_first_run = FALSE; + + stamp_dir_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, NULL); + if (g_mkdir_with_parents (stamp_dir_path, 0755)) { +@@ -675,6 +728,8 @@ maybe_convert_old_settings (GSettings *settings) + if (g_file_test (stamp_file_path, G_FILE_TEST_EXISTS)) + goto out; + ++ is_first_run = TRUE; ++ + sources = g_settings_get_value (settings, KEY_INPUT_SOURCES); + if (g_variant_n_children (sources) < 1) { + convert_libgnomekbd_layouts (settings); +@@ -693,6 +748,8 @@ maybe_convert_old_settings (GSettings *settings) + out: + g_free (stamp_file_path); + g_free (stamp_dir_path); ++ ++ return is_first_run; + } + + static void +@@ -707,7 +764,7 @@ maybe_create_initial_settings (GsdKeyboardManager *manager) + if (g_getenv ("RUNNING_UNDER_GDM")) + return; + +- maybe_convert_old_settings (settings); ++ gboolean is_first_run = maybe_convert_old_settings (settings); /* if we still don't have anything do some educated guesses */ sources = g_settings_get_value (settings, KEY_INPUT_SOURCES); -- if (g_variant_n_children (sources) < 1) -+ if (g_variant_n_children (sources) < 1) { +@@ -715,6 +772,9 @@ maybe_create_initial_settings (GsdKeyboardManager *manager) get_sources_from_xkb_config (manager); -+ add_ibus_sources_from_locale (settings); -+ } g_variant_unref (sources); ++ if (is_first_run) ++ add_ibus_sources_from_locale (settings); ++ options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS); + if (g_strv_length (options) < 1) + get_options_from_xkb_config (manager);
-- ubuntu-desktop mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
