Commit 58f34488 authored by Bernhard Rosenkraenzer's avatar Bernhard Rosenkraenzer Committed by Nate Graham
Browse files

Fix emojier displaying a blank window with ibus 1.5.26

Skip over invalid entries in a dictionary instead of throwing
the whole dictionary away.

Also change the qWarning() message to reflect the new reality.

BUG: 457521
FIXED-IN: 5.26


(cherry picked from commit 925aecd8)
parent 96baf096
Pipeline #215314 passed with stage
in 3 minutes and 42 seconds
......@@ -111,10 +111,9 @@ public:
for (GSList *l = list; l; l = l->next) {
IBusEmojiData *data = (IBusEmojiData *)l->data;
if (!IBUS_IS_EMOJI_DATA(data)) {
qWarning() << "Your dict format is no longer supported.\n"
"Need to create the dictionaries again.";
g_slist_free(list);
return;
qWarning() << "Skipping over invaid data in " << dictPath << ".\n"
"You might need to create the dictionaries again.";
continue;
}
const QString emoji = QString::fromUtf8(ibus_emoji_data_get_emoji(data));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment