diff -Nru ibus-m17n-1.4.8/configure.ac ibus-m17n-1.4.9/configure.ac --- ibus-m17n-1.4.8/configure.ac 2021-10-19 15:13:11.000000000 +0000 +++ ibus-m17n-1.4.9/configure.ac 2022-01-18 08:13:31.000000000 +0000 @@ -22,7 +22,7 @@ m4_define([ibus_released], [1]) m4_define([ibus_major_version], [1]) m4_define([ibus_minor_version], [4]) -m4_define([ibus_micro_version], [8]) +m4_define([ibus_micro_version], [9]) m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) diff -Nru ibus-m17n-1.4.8/debian/changelog ibus-m17n-1.4.9/debian/changelog --- ibus-m17n-1.4.8/debian/changelog 2021-12-02 20:08:30.000000000 +0000 +++ ibus-m17n-1.4.9/debian/changelog 2022-01-25 19:56:35.000000000 +0000 @@ -1,3 +1,10 @@ +ibus-m17n (1.4.9-1) unstable; urgency=medium + + * Team upload + * New upstream release + + -- Gunnar Hjalmarsson Tue, 25 Jan 2022 20:56:35 +0100 + ibus-m17n (1.4.8-1) unstable; urgency=medium * Team upload diff -Nru ibus-m17n-1.4.8/m17n.appdata.xml ibus-m17n-1.4.9/m17n.appdata.xml --- ibus-m17n-1.4.8/m17n.appdata.xml 2021-10-19 15:13:11.000000000 +0000 +++ ibus-m17n-1.4.9/m17n.appdata.xml 2022-01-18 08:13:31.000000000 +0000 @@ -17,6 +17,28 @@ https://github.com/ibus/ibus-m17n/issues https://github.com/ibus/ibus-m17n + + +

This new stable release includes these changes:

+
+ github.com/ibus/ibus-m17n/releases/tag/1.4.9 + + + Hide status from the panel if status == title (by Daiki + Ueno, this patch has been applied to the Fedora packages for + a long time, take it upstream) + + + Free lang and name after engine_name is built + + + Just return from ibus_m17n_engine_callback with nullable m17n + + + Accept virtual engine names for CI + + +

This new stable release includes these changes:

diff -Nru ibus-m17n-1.4.8/po/ibus-m17n.pot ibus-m17n-1.4.9/po/ibus-m17n.pot --- ibus-m17n-1.4.8/po/ibus-m17n.pot 2021-10-19 15:13:11.000000000 +0000 +++ ibus-m17n-1.4.9/po/ibus-m17n.pot 2022-01-18 08:13:31.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ibus-m17n 1.4.7\n" +"Project-Id-Version: ibus-m17n 1.4.9\n" "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n" -"POT-Creation-Date: 2021-08-13 19:52+0200\n" +"POT-Creation-Date: 2022-01-18 09:12+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru ibus-m17n-1.4.8/src/engine.c ibus-m17n-1.4.9/src/engine.c --- ibus-m17n-1.4.8/src/engine.c 2021-10-19 15:13:11.000000000 +0000 +++ ibus-m17n-1.4.9/src/engine.c 2022-01-18 08:13:31.000000000 +0000 @@ -41,6 +41,7 @@ gint lookup_table_orientation; gboolean use_us_layout; + gchar *title; MInputMethod *im; }; @@ -105,9 +106,10 @@ gchar **strv; g_return_val_if_fail (g_str_has_prefix (engine_name, "m17n:"), FALSE); - strv = g_strsplit (engine_name, ":", 3); + /* Test engine name 'm17n:lang:layout:ci' works */ + strv = g_strsplit (engine_name, ":", -1); - if (g_strv_length (strv) != 3) { + if (g_strv_length (strv) < 3) { g_strfreev (strv); g_return_val_if_reached (FALSE); } @@ -236,10 +238,13 @@ "org.freedesktop.ibus.engine.m17n", g_strdup_printf ("/org/freedesktop/ibus/engine/m17n/%s/%s/", lang, name)); + MPlist *l = minput_get_title_icon (msymbol (lang), msymbol (name)); + if (l && mplist_key (l) == Mtext) { + klass->title = ibus_m17n_mtext_to_utf8 (mplist_value (l)); + } + engine_name = g_strdup_printf ("m17n:%s:%s", lang, name); g_free (lang); g_free (name); - - engine_name = g_strdup_printf ("m17n:%s:%s", lang, name); engine_config = ibus_m17n_get_engine_config (engine_name); g_free (engine_name); @@ -936,7 +941,12 @@ IBusM17NEngine *m17n = NULL; m17n = context->arg; - g_return_if_fail (m17n != NULL); + /* m17n always can be NULL when create_ic_for_im() calls minput_create_ic() + * in m17n-lib-1.8.0/src/input.c and g_return_if_fail() should not be + * called with CI since warnings are treated as errors. + */ + if (!m17n) + return; /* the callback may be called in minput_create_ic, in the time * m17n->context has not be assigned, so need assign it. */ @@ -959,8 +969,9 @@ else if (command == Minput_status_draw) { gchar *status; status = ibus_m17n_mtext_to_utf8 (m17n->context->status); + IBusM17NEngineClass *klass = (IBusM17NEngineClass *) G_OBJECT_GET_CLASS (m17n); - if (status && strlen (status)) { + if (status && strlen (status) && g_strcmp0 (status, klass->title)) { IBusText *text; text = ibus_text_new_from_string (status); ibus_property_set_label (m17n->status_prop, text);