EHTMLEditor: Prefer emoji over emoticon

This changes the Insert Emoticon on the toolbar to Insert Emoji
and adds Insert Emoji to the context menu.

src/e-util/e-html-editor-actions.c

@@ -1081,6 +1081,13 @@ static GtkActionEntry core_editor_entries[] = {
 	  N_("Insert Emoji"),
 	  G_CALLBACK (action_insert_emoji_cb) },
 
+	{ "insert-emoji-toolbar",
+	  "face-smile",
+	  N_("Insert E_moji"),
+	  NULL,
+	  N_("Insert Emoji"),
+	  G_CALLBACK (action_insert_emoji_cb) },
+
 	{ "insert-html-file",
 	  NULL,
 	  N_("_HTML File…"),

src/e-util/e-html-editor-manager.ui

@@ -121,7 +121,7 @@
     <toolitem action='unindent'/>
     <toolitem action='indent'/>
     <separator/>
-    <toolitem action='insert-emoticon'/>
+    <toolitem action='insert-emoji-toolbar'/>
   </toolbar>
   <toolbar name='html-toolbar'>
     <separator/>
@@ -180,5 +180,7 @@
       <menuitem action='context-delete-column'/>
       <menuitem action='context-delete-cell'/>
     </menu>
+    <separator/>
+    <menuitem action='insert-emoji-toolbar'/>
   </popup>
 </ui>