From: Daniel Boles <dboles@src.gnome.org>
Date: Mon, 28 Aug 2017 19:35:47 +0000 (+0100)
Subject: Entry: Handle :show-emoji-icon becoming false
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~283
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=669e8c4de578f174a48f39f4a1a5bc1bfaf758b5;p=gtk%2B3.0.git

Entry: Handle :show-emoji-icon becoming false

Disconnect the now-unwanted signal handler, and hide the icon.

https://bugzilla.gnome.org/show_bug.cgi?id=786940
---

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index c3060e4909..58f1672158 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -11092,6 +11092,14 @@ set_show_emoji_icon (GtkEntry *entry,
 
       g_signal_connect (entry, "icon-press", G_CALLBACK (pick_emoji), NULL);
     }
+  else
+    {
+      g_signal_handlers_disconnect_by_func (entry, pick_emoji, NULL);
+
+      gtk_entry_set_icon_from_icon_name (entry,
+                                         GTK_ENTRY_ICON_SECONDARY,
+                                         NULL);
+    }
 
   g_object_notify_by_pspec (G_OBJECT (entry), entry_props[PROP_SHOW_EMOJI_ICON]);
   gtk_widget_queue_resize (GTK_WIDGET (entry));