Merge branch 'master' into native-layoutnative-layout

Conflicts:
	gtk/gtkplug.c
	gtk/gtkscrolledwindow.c

1 files changed, 3 insertions, 3 deletions

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index ea922a8772..a7cd8461f1 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1543,7 +1543,7 @@ gtk_main_do_event (GdkEvent *event)
       /* Unexpected GDK_DESTROY from the outside, ignore for
        * child windows, handle like a GDK_DELETE for toplevels
        */
-      if (!event_widget->parent)
+      if (!gtk_widget_get_parent (event_widget))
 	{
 	  g_object_ref (event_widget);
 	  if (!gtk_widget_event (event_widget, event) &&
@@ -2411,8 +2411,8 @@ gtk_propagate_event (GtkWidget *widget,
 	    handled_event = event->type != GDK_SCROLL;
 	  else
 	    handled_event = gtk_widget_event (widget, event);
-	      
-	  tmp = widget->parent;
+
+          tmp = gtk_widget_get_parent (widget);
 	  g_object_unref (widget);
 
 	  widget = tmp;