Merge branch 'mjog/713-composer-emoji' into 'mainline'

Composer context menu emoji

Closes #713

See merge request GNOME/geary!415
This commit is contained in:
Michael Gratton 2020-02-19 00:43:47 +00:00
commit 91b7e5bef4
2 changed files with 2 additions and 1 deletions

View file

@ -53,7 +53,7 @@ valac = meson.get_compiler('vala')
target_glib = '2.60.4'
target_gtk = '3.24.7'
target_webkit = '2.24'
target_webkit = '2.26'
# Primary deps
glib = dependency('glib-2.0', version: '>=' + target_glib)

View file

@ -2307,6 +2307,7 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
const WebKit.ContextMenuAction[] TEXT_INPUT_ACTIONS = {
WebKit.ContextMenuAction.INPUT_METHODS,
WebKit.ContextMenuAction.UNICODE,
WebKit.ContextMenuAction.INSERT_EMOJI,
};
Gee.List<WebKit.ContextMenuItem> existing_spelling =