[gtk/matthiasc/for-master] text: Don't replace unselected text with Emoji

[Matthias Clasen <matthiasc src gnome org>]

commit 635492b016f724aba6bfedfe72cec6c8bfdb1e2e
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Sep 5 08:38:18 2020 -0400

    text: Don't replace unselected text with Emoji
    
    We must be careful to not select everything on focus-in
    before we have the Emoji inserted. This was accidentally
    broken in d5121af876032af09bd9.
    
    Fixes: #3122

 gtk/gtktext.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 16968119bc..6af06f39fe 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -6825,7 +6825,7 @@ gtk_text_insert_emoji (GtkText *self)
 
       gtk_widget_set_parent (chooser, GTK_WIDGET (self));
       g_signal_connect (chooser, "emoji-picked", G_CALLBACK (emoji_picked), self);
-      g_signal_connect_swapped (chooser, "hide", G_CALLBACK (gtk_widget_grab_focus), self);
+      g_signal_connect_swapped (chooser, "hide", G_CALLBACK (gtk_text_grab_focus_without_selecting), self);
     }
 
   gtk_popover_popup (GTK_POPOVER (chooser));