Merge branch 'force-emoji' into 'master'

Force emoji presentation

See merge request GNOME/gtk!431
This commit is contained in:
Matthias Clasen 2018-11-30 21:38:02 +00:00
commit 6f8c4f873d
2 changed files with 2 additions and 0 deletions

View File

@ -361,6 +361,7 @@ add_emoji (GtkWidget *box,
p += g_unichar_to_utf8 (code, p);
}
g_variant_unref (codes);
p += g_unichar_to_utf8 (0xFE0E, p); /* U+FE0F is the Emoji variation selector */
p[0] = 0;
label = gtk_label_new (text);

View File

@ -452,6 +452,7 @@ get_text (GVariant *emoji_data,
p += g_unichar_to_utf8 (code, p);
}
g_variant_unref (codes);
p += g_unichar_to_utf8 (0xFE0F, p); /* U+FE0F is the Emoji variation selector */
p[0] = 0;
}