From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 2 Sep 2017 12:42:52 +0000 (-0400)
Subject: entry: Consider input hints for Emoji support
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~246
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=172c6c194949755672db747508918c9265e0d89f;p=gtk%2B3.0.git

entry: Consider input hints for Emoji support

Don't show "insert emoji" in the context menu if input
hints indicate that Emoji input is not useful.
---

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 6c5a614819..2ee69315bb 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -9576,14 +9576,18 @@ popup_targets_received (GtkClipboard     *clipboard,
       gtk_widget_show (menuitem);
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 
-      menuitem = gtk_menu_item_new_with_mnemonic (_("Insert _Emoji"));
-      gtk_widget_set_sensitive (menuitem,
-                                mode == DISPLAY_NORMAL &&
-                                info_entry_priv->editable);
-      g_signal_connect_swapped (menuitem, "activate",
-                                G_CALLBACK (gtk_entry_choose_emoji), entry);
-      gtk_widget_show (menuitem);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+      if (info_entry_priv->show_emoji_icon ||
+          (gtk_entry_get_input_hints (entry) & GTK_INPUT_HINT_NO_EMOJI) == 0)
+        {
+          menuitem = gtk_menu_item_new_with_mnemonic (_("Insert _Emoji"));
+          gtk_widget_set_sensitive (menuitem,
+                                    mode == DISPLAY_NORMAL &&
+                                    info_entry_priv->editable);
+          g_signal_connect_swapped (menuitem, "activate",
+                                    G_CALLBACK (gtk_entry_choose_emoji), entry);
+          gtk_widget_show (menuitem);
+          gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+        }
 
       g_signal_emit (entry, signals[POPULATE_POPUP], 0, menu);