[gtk: 6/6] Merge branch 'wip/carlosg/fix-search-entry' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit b9a41a903b6997f0e57d717cea5e11b1c21bafb1
Merge: ef89ef9051 b741d36ced
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Feb 20 17:02:15 2019 +0000

    Merge branch 'wip/carlosg/fix-search-entry' into 'master'
    
    Fix search bars
    
    See merge request GNOME/gtk!593

 gtk/gtkeventcontrollerkey.c   | 10 ++++++++--
 gtk/gtksearchbar.c            |  3 +++
 gtk/gtksearchentry.c          |  2 +-
 gtk/gtkwidget.c               | 14 +++++++-------
 gtk/gtkwidgetprivate.h        |  6 +++---
 gtk/inspector/resource-list.c |  2 +-
 6 files changed, 23 insertions(+), 14 deletions(-)
---
diff --cc gtk/gtkwidget.c
index ab2f219551,124ecc5628..d4eac90902
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@@ -5145,13 -5168,9 +5145,13 @@@ _gtk_widget_captured_event (GtkWidge
      return TRUE;
  
    event_copy = gdk_event_copy (event);
 -  translate_event_coordinates (event_copy, widget);
 +  if (!translate_event_coordinates (event_copy, widget))
 +    {
 +      g_object_unref (event_copy);
 +      return FALSE;
 +    }
  
-   return_val = _gtk_widget_run_controllers (widget, event_copy, GTK_PHASE_CAPTURE);
+   return_val = gtk_widget_run_controllers (widget, event_copy, GTK_PHASE_CAPTURE);
  
    handler = g_object_get_data (G_OBJECT (widget), I_("captured-event-handler"));
    if (!handler)
@@@ -5251,17 -5267,13 +5251,17 @@@ gtk_widget_event_internal (GtkWidge
  
    event_copy = gdk_event_copy (event);
  
 -  translate_event_coordinates (event_copy, widget);
 +  if (!translate_event_coordinates (event_copy, widget))
 +    {
 +      g_object_unref (event_copy);
 +      return FALSE;
 +    }
  
    if (widget == gtk_get_event_target (event_copy))
-     return_val |= _gtk_widget_run_controllers (widget, event_copy, GTK_PHASE_TARGET);
+     return_val |= gtk_widget_run_controllers (widget, event_copy, GTK_PHASE_TARGET);
  
    if (return_val == FALSE)
-     return_val |= _gtk_widget_run_controllers (widget, event_copy, GTK_PHASE_BUBBLE);
+     return_val |= gtk_widget_run_controllers (widget, event_copy, GTK_PHASE_BUBBLE);
    g_object_unref (event_copy);
  
    if (return_val == FALSE &&