[totem] Fix the build with recent GTK+

[carlosgc src gnome org]

commit ddb9c8bf71f344759e12627aeb3de1f26a4a58ce
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Sun Jan 30 16:44:10 2011 +0100

    Fix the build with recent GTK+
    
    And bump GTK+ requirements to 2.99.3
    
    https://bugzilla.gnome.org/show_bug.cgi?id=640947

 browser-plugin/totem-plugin-viewer.c               |    6 +++---
 configure.in                                       |    2 +-
 .../bacon-video-widget-gst-missing-plugins.c       |    8 ++++----
 src/totem-interface.c                              |    4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c
index 3b6e2da..8f63842 100644
--- a/browser-plugin/totem-plugin-viewer.c
+++ b/browser-plugin/totem-plugin-viewer.c
@@ -33,7 +33,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <gdk/gdkx.h>
+#include <gtk/gtkx.h>
 #include <gtk/gtk.h>
 
 #include <gdk/gdk.h>
@@ -1797,7 +1797,7 @@ totem_embedded_key_press_event (GtkWidget *widget, GdkEventKey *event,
 
 static gboolean
 totem_embedded_construct (TotemEmbedded *emb,
-			  GdkNativeWindow xid,
+			  Window xid,
 			  int width,
 			  int height)
 {
@@ -2086,7 +2086,7 @@ totem_embedded_set_window (TotemEmbedded *embedded,
 	embedded->width = width;
 	embedded->height = height;
 
-	totem_embedded_construct (embedded, (GdkNativeWindow) window,
+	totem_embedded_construct (embedded, (Window) window,
 				  width, height);
 
 	return TRUE;
diff --git a/configure.in b/configure.in
index 4518e32..0ca0954 100644
--- a/configure.in
+++ b/configure.in
@@ -43,7 +43,7 @@ AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 # Requirements
 GLIB_REQS=2.27.92
 GIO_REQS=2.27.92
-GTK_REQS=2.99.2
+GTK_REQS=2.99.3
 TOTEM_PLPARSER_REQS=2.32.2
 GNOMEICON_REQS=2.15.90
 DBUS_REQS=0.82
diff --git a/src/backend/bacon-video-widget-gst-missing-plugins.c b/src/backend/bacon-video-widget-gst-missing-plugins.c
index bb874ca..f91c58f 100644
--- a/src/backend/bacon-video-widget-gst-missing-plugins.c
+++ b/src/backend/bacon-video-widget-gst-missing-plugins.c
@@ -35,7 +35,7 @@
 #include <gtk/gtk.h>
 
 #ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
+#include <gtk/gtkx.h>
 #endif
 
 #include <string.h>
@@ -57,12 +57,12 @@ TotemCodecInstallContext;
 
 #ifdef GDK_WINDOWING_X11
 /* Adapted from totem-interface.c */
-static GdkNativeWindow
+static Window
 bacon_video_widget_gtk_plug_get_toplevel (GtkPlug *plug)
 {
 	Window root, parent, *children;
 	guint nchildren;
-	GdkNativeWindow xid;
+	Window xid;
 
 	g_return_val_if_fail (GTK_IS_PLUG (plug), 0);
 
@@ -86,7 +86,7 @@ bacon_video_widget_gtk_plug_get_toplevel (GtkPlug *plug)
 	while (TRUE);
 }
 
-static GdkNativeWindow
+static Window
 bacon_video_widget_gst_get_toplevel (GtkWidget *widget)
 {
 	GtkWidget *parent;
diff --git a/src/totem-interface.c b/src/totem-interface.c
index 5d2b42d..a17fef5 100644
--- a/src/totem-interface.c
+++ b/src/totem-interface.c
@@ -43,7 +43,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gdk/gdkx.h>
+#include <gtk/gtkx.h>
 
 #include "totem-interface.h"
 
@@ -293,7 +293,7 @@ totem_gtk_plug_get_toplevel (GtkPlug *plug)
 {
 	Window root, parent, *children;
 	guint nchildren;
-	GdkNativeWindow xid;
+	Window xid;
 
 	g_return_val_if_fail (GTK_IS_PLUG (plug), NULL);