[gtk: 5/5] Merge branch 'entry-fix' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 3ce6a710a38bc6d0c6afea5ade430bf5aa979216
Merge: 6878c2bae0 e41596d6a1
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed May 1 05:21:09 2019 +0000

    Merge branch 'entry-fix' into 'master'
    
    Fix Emoji insertion
    
    See merge request GNOME/gtk!800

 gtk/gtkentry.c              |  5 ++++-
 gtk/gtktext.c               | 21 ++++++++++++++++++++-
 gtk/inspector/prop-editor.c | 37 +++++++++++++++++++++++++------------
 gtk/inspector/prop-list.c   | 20 --------------------
 4 files changed, 49 insertions(+), 34 deletions(-)
---