2008-05-19 Tomas Frydrych <tf@openedhand.com>

	    * clutter-gtk/gtk-clutter-embed.c:
	    Fixed inclusion of clutter-x11.h following change in structure of
	    clutter includes.

diff --git a/ChangeLog b/ChangeLog
index f1f8492..c29738e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-19  Tomas Frydrych  <tf@openedhand.com>
+
+       * clutter-gtk/gtk-clutter-embed.c:
+       Fixed inclusion of clutter-x11.h following change in structure of
+       clutter includes.
+
 2008-05-15  Emmanuele Bassi  <ebassi@openedhand.com>
 
        * clutter-gtk/gtk-clutter-embed.c:
@@ -78,7 +84,7 @@
        (gtk_clutter_embed_realize): Always request button and key events
        in the window event mask. They aren't included by default on
        Windows.
-       
+
        * README (Requirements): Added a note about the minimum Clutter
        version for the Win32 backend.
 
@@ -128,7 +134,7 @@
 2008-04-01  Matthew Allum  <mallum@openedhand.com>
 
        * clutter-gtk/gtk-clutter-embed.c:
-        Update for latest trunk multistage. 
+        Update for latest trunk multistage.
         Should now support multple widgets.
 
 2008-02-29  Emmanuele Bassi  <ebassi@openedhand.com>
@@ -148,25 +154,25 @@
        * clutter-gtk/gtk-clutter-embed.c:
        * clutter-gtk/gtk-clutter-embed.h:
         Add clutter_gtk_init(), as to use new API to share DISPLAY and
-        turn off Clutter 'automatic' event collection. 
+        turn off Clutter 'automatic' event collection.
         Add methods for;
           expose    - Queue a Clutter redraw.
           map       - set Actor mapped flag.
-          show/hide - Forward to stage also. 
+          show/hide - Forward to stage also.
         Minor doc additions.
-          
+
        * examples/gtk-clutter-events.c:
-        Add some minor comments re when to call show_all().        
+        Add some minor comments re when to call show_all().
 
        * examples/gtk-clutter-test.c:
-        Fix event->actor mapping. 
+        Fix event->actor mapping.
 
 2008-02-21  Emmanuele Bassi  <ebassi@openedhand.com>
 
        * clutter-gtk/gtk-clutter-embed.c:
        (gtk_clutter_embed_send_configure): Emit a Configure event
        with the coordinates for the widget area.
-       
+
        (gtk_clutter_embed_realize),
        (gtk_clutter_embed_size_allocate): Send the configure event.
 
@@ -237,10 +243,10 @@
 
        (gtk_clutter_map): Use the new X11 API for retrieving the
        XID of the stage window.
-       
+
        (gtk_clutter_init): Set the widget as paintable and the stage
        as resizable.
-       
+
        * examples/gtk-clutter-events.c:
        (on_x_changed), (on_y_changed), (on_z_changed): Use the new
        clutter_actor_set_rotation() API.
@@ -375,7 +381,7 @@
        * clutter-gtk/gtk-clutter.h:
        * configure.ac:
        * examples/gtk-clutter-test.c:
-       Various naming fixups. 
+       Various naming fixups.
 
 2007-03-21  Matthew Allum  <mallum@openedhand.com>
 

diff --git a/clutter-gtk/gtk-clutter-embed.c b/clutter-gtk/gtk-clutter-embed.c
index 82d4dc9..b7b7ac7 100644 (file)
--- a/clutter-gtk/gtk-clutter-embed.c
+++ b/clutter-gtk/gtk-clutter-embed.c
@@ -51,7 +51,7 @@
 
 #if defined(HAVE_CLUTTER_GTK_X11)
 
-#include <clutter/clutter-x11.h>
+#include <clutter/x11/clutter-x11.h>
 #include <gdk/gdkx.h>
 
 #elif defined(HAVE_CLUTTER_GTK_WIN32)