|
 |
fb1710 |
From 12a00f024c16a4540d5f457389fada2a4886d884 Mon Sep 17 00:00:00 2001
|
|
|
fb1710 |
From: Matthias Clasen <mclasen@redhat.com>
|
|
|
fb1710 |
Date: Tue, 25 May 2021 16:07:58 -0400
|
|
|
fb1710 |
Subject: [PATCH] entry: Only offer Emoji if requested
|
|
|
fb1710 |
|
|
|
fb1710 |
Only offer the "Insert Emoji" context menu when input
|
|
|
fb1710 |
hints explicitly suggest supporting Emoji.
|
|
|
fb1710 |
---
|
|
|
fb1710 |
gtk/gtkentry.c | 2 +-
|
|
|
fb1710 |
gtk/gtktextview.c | 2 +-
|
|
|
fb1710 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
fb1710 |
|
|
|
fb1710 |
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
|
|
|
fb1710 |
index a01684101f..1f5a790ccc 100644
|
|
|
fb1710 |
--- a/gtk/gtkentry.c
|
|
|
fb1710 |
+++ b/gtk/gtkentry.c
|
|
|
fb1710 |
@@ -9591,7 +9591,7 @@ popup_targets_received (GtkClipboard *clipboard,
|
|
|
fb1710 |
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
|
|
|
fb1710 |
|
|
|
fb1710 |
if (info_entry_priv->show_emoji_icon ||
|
|
|
fb1710 |
- (gtk_entry_get_input_hints (entry) & GTK_INPUT_HINT_NO_EMOJI) == 0)
|
|
|
fb1710 |
+ (gtk_entry_get_input_hints (entry) & GTK_INPUT_HINT_EMOJI) != 0)
|
|
|
fb1710 |
{
|
|
|
fb1710 |
menuitem = gtk_menu_item_new_with_mnemonic (_("Insert _Emoji"));
|
|
|
fb1710 |
gtk_widget_set_sensitive (menuitem,
|
|
|
fb1710 |
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
|
|
|
fb1710 |
index e0b1e20e87..eb53843fa6 100644
|
|
|
fb1710 |
--- a/gtk/gtktextview.c
|
|
|
fb1710 |
+++ b/gtk/gtktextview.c
|
|
|
fb1710 |
@@ -9521,7 +9521,7 @@ popup_targets_received (GtkClipboard *clipboard,
|
|
|
fb1710 |
gtk_widget_show (menuitem);
|
|
|
fb1710 |
gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem);
|
|
|
fb1710 |
|
|
|
fb1710 |
- if ((gtk_text_view_get_input_hints (text_view) & GTK_INPUT_HINT_NO_EMOJI) == 0)
|
|
|
fb1710 |
+ if ((gtk_text_view_get_input_hints (text_view) & GTK_INPUT_HINT_EMOJI) != 0)
|
|
|
fb1710 |
{
|
|
|
fb1710 |
menuitem = gtk_menu_item_new_with_mnemonic (_("Insert _Emoji"));
|
|
|
fb1710 |
gtk_widget_set_sensitive (menuitem, can_insert);
|
|
|
fb1710 |
--
|
|
|
fb1710 |
2.31.1
|
|
|
fb1710 |
|