diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2018-11-30 21:38:02 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2018-11-30 21:38:02 +0000 |
| commit | 6f8c4f873d769e53a74c09d8d9cf8b95fd08966a (patch) | |
| tree | 7d12883eab1997932a91e99d56551104999e5e1c | |
| parent | f3c704b82e6d480ac0de0aed7ad648d71ebaaaab (diff) | |
| parent | 7a4e9fa4d38eb917ce9eddfe5ae6b7cd87dd48c7 (diff) | |
| download | gtk+-6f8c4f873d769e53a74c09d8d9cf8b95fd08966a.tar.gz | |
Merge branch 'force-emoji' into 'master'
Force emoji presentation
See merge request GNOME/gtk!431
| -rw-r--r-- | gtk/gtkemojichooser.c | 1 | ||||
| -rw-r--r-- | gtk/gtkemojicompletion.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c index a829884fcc..d8124cb90f 100644 --- a/gtk/gtkemojichooser.c +++ b/gtk/gtkemojichooser.c @@ -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); diff --git a/gtk/gtkemojicompletion.c b/gtk/gtkemojicompletion.c index e7583126d9..058e1867e2 100644 --- a/gtk/gtkemojicompletion.c +++ b/gtk/gtkemojicompletion.c @@ -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; } |