Merge branch 'master' into native-layoutnative-layout

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

1 files changed, 5 insertions, 13 deletions

diff --git a/gdk/gdkwindowimpl.c b/gdk/gdkwindowimpl.c
index 48fe438fd8..2c4df30d51 100644
--- a/gdk/gdkwindowimpl.c
+++ b/gdk/gdkwindowimpl.c
@@ -29,19 +29,11 @@
 #include "gdkinternals.h"
 
 
-GType
-gdk_window_impl_get_type (void)
-{
-  static GType gtype = 0;
+typedef GdkWindowImplIface GdkWindowImplInterface;
+G_DEFINE_INTERFACE (GdkWindowImpl, gdk_window_impl, G_TYPE_OBJECT);
 
-  if (G_UNLIKELY (!gtype))
-    {
-      gtype = g_type_register_static_simple (G_TYPE_INTERFACE,
-                                             "GdkWindowImpl",
-                                             sizeof (GdkWindowImplIface),
-                                             NULL, 0, NULL, 0);
-      g_type_interface_add_prerequisite (gtype, G_TYPE_OBJECT);
-    }
 
-  return gtype;
+static void
+gdk_window_impl_default_init (GdkWindowImplInterface *iface)
+{
 }