mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-30 15:31:34 +00:00
Merge branch 'force-emoji' into 'master'
Force emoji presentation See merge request GNOME/gtk!431
This commit is contained in:
commit
6f8c4f873d
@ -361,6 +361,7 @@ add_emoji (GtkWidget *box,
|
|||||||
p += g_unichar_to_utf8 (code, p);
|
p += g_unichar_to_utf8 (code, p);
|
||||||
}
|
}
|
||||||
g_variant_unref (codes);
|
g_variant_unref (codes);
|
||||||
|
p += g_unichar_to_utf8 (0xFE0E, p); /* U+FE0F is the Emoji variation selector */
|
||||||
p[0] = 0;
|
p[0] = 0;
|
||||||
|
|
||||||
label = gtk_label_new (text);
|
label = gtk_label_new (text);
|
||||||
|
@ -452,6 +452,7 @@ get_text (GVariant *emoji_data,
|
|||||||
p += g_unichar_to_utf8 (code, p);
|
p += g_unichar_to_utf8 (code, p);
|
||||||
}
|
}
|
||||||
g_variant_unref (codes);
|
g_variant_unref (codes);
|
||||||
|
p += g_unichar_to_utf8 (0xFE0F, p); /* U+FE0F is the Emoji variation selector */
|
||||||
p[0] = 0;
|
p[0] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user