From 69707e94a405302d7f82e310a87842646a0a8e10 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@openedhand.com>
Date: Thu, 30 Nov 2006 11:08:54 +0000
Subject: [PATCH] 2006-11-30  Emmanuele Bassi  <ebassi@openedhand.com>

	* Makefile.am: Remove the gtk directory from the SUBDIRS.

	* clutter/clutter-stage.h:
	* clutter/clutter-stage.c: Add clutter_stage_swap_buffers(),
	which swaps the GL buffers.  This fixes the redraw in the
	GTK widget.
---
 ChangeLog               |  9 +++++++++
 Makefile.am             |  4 ----
 clutter/Makefile.am     |  2 +-
 clutter/clutter-stage.c | 13 +++++++++++++
 clutter/clutter-stage.h |  3 ++-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eb548555a..fad3392a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-11-30  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* Makefile.am: Remove the gtk directory from the SUBDIRS.
+
+	* clutter/clutter-stage.h:
+	* clutter/clutter-stage.c: Add clutter_stage_swap_buffers(),
+	which swaps the GL buffers.  This fixes the redraw in the
+	GTK widget.
+
 2006-11-29  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/clutter-stage.c:
diff --git a/Makefile.am b/Makefile.am
index 15f18f41f..06804bec4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,5 @@
 SUBDIRS=clutter doc examples 
 
-if ENABLE_GTK
-SUBDIRS += gtk
-endif
-
 pcfiles = clutter-@CLUTTER_MAJORMINOR@.pc
 
 %-@CLUTTER_MAJORMINOR@.pc: %.pc
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index aec8cd630..e2c577790 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -137,7 +137,7 @@ libclutter_@CLUTTER_MAJORMINOR@_la_LIBADD  = \
             @CLUTTER_LIBS@ $(top_srcdir)/clutter/pango/libpangoclutter.la
 libclutter_@CLUTTER_MAJORMINOR@_la_LDFLAGS = @CLUTTER_LT_LDFLAGS@
 libclutter_@CLUTTER_MAJORMINOR@_la_DEPENDENCIES = \
-            $(top_srcdir)/clutter/pango/libpangoclutter.a
+            $(top_srcdir)/clutter/pango/libpangoclutter.la
 
 clutterheadersdir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter
 clutterheaders_HEADERS = $(source_h) 		\
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index f6d008151..899910fb7 100644
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -1138,3 +1138,16 @@ clutter_stage_get_actor_at_pos (ClutterStage *stage,
   return found;
 }
 
+void
+clutter_stage_swap_buffers (ClutterStage *stage)
+{
+  ClutterStagePrivate *priv;
+  ClutterMainContext *context;
+
+  g_return_if_fail (CLUTTER_IS_STAGE (stage));
+
+  priv = stage->priv;
+  context = clutter_context_get_default ();
+
+  glXSwapBuffers (context->xdpy, stage->priv->xwin);
+}
diff --git a/clutter/clutter-stage.h b/clutter/clutter-stage.h
index 0edec5d45..113472846 100644
--- a/clutter/clutter-stage.h
+++ b/clutter/clutter-stage.h
@@ -124,7 +124,8 @@ GdkPixbuf *   clutter_stage_snapshot            (ClutterStage       *stage,
 						 gint                y,
 						 gint                width,
 						 gint                height);
-const XVisualInfo * clutter_stage_get_xvisual   (ClutterStage *stage);
+const XVisualInfo * clutter_stage_get_xvisual   (ClutterStage       *stage);
+void          clutter_stage_swap_buffers        (ClutterStage       *stage);
 
 G_END_DECLS