Revert a change to the plug/socket headers

I was trying to avoid including gtk.h here, but this breaks
some of our tests, and there's a good chance that 3rd party
code also relies on this include.

diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index 8ccfbda43c8d88add508b371d278aee8c2ef5cfe..7c44bdc404f0783f6b3e548406d066e6b94fbc77 100644 (file)
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -37,7 +37,6 @@
 #include <gdk/gdkx.h>
 
 #include <gtk/gtksocket.h>
-#include <gtk/gtkwindow.h>
 
 
 G_BEGIN_DECLS

diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index a8d6ebcdf4ef5276654b51ea04941819d50a513e..2415b142d92f16d45846465b19df8d1a1f48e6f4 100644 (file)
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -30,8 +30,7 @@
 #ifndef __GTK_SOCKET_H__
 #define __GTK_SOCKET_H__
 
-#include <gdk/gdk.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #ifdef GDK_WINDOWING_X11