From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 1 Sep 2017 23:51:17 +0000 (-0400)
Subject: emoji chooser: Avoid a crash
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~252
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f0b4b45b76029c31b8c4b1fcd8deeeddc8d03fa4;p=gtk%2B3.0.git

emoji chooser: Avoid a crash

The emoji chooser gets disposed already, because it is attached
to the toplevel as a popover. Doing it again when the object data
is cleared is leading to a crash.

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

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 3b11290909..6c5a614819 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -11048,7 +11048,7 @@ gtk_entry_choose_emoji (GtkEntry *entry)
   if (!chooser)
     {
       chooser = gtk_emoji_chooser_new ();
-      g_object_set_data_full (G_OBJECT (entry), "gtk-emoji-chooser", chooser, (GDestroyNotify)gtk_widget_destroy);
+      g_object_set_data (G_OBJECT (entry), "gtk-emoji-chooser", chooser);
 
       gtk_popover_set_relative_to (GTK_POPOVER (chooser), GTK_WIDGET (entry));
       if (entry->priv->show_emoji_icon)