diff --git a/ChangeLog b/ChangeLog
index 78e2483182..a60c2744ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
-2007-06-17  Daniel Elstner  <danielk@openismus.com>
+2007-06-17  Xan Lopez  <xan@gnome.org>
 
+	* gdk/x11/gdkgeometry-x11.c: replace GDK_WINDOW calls by cast to
+	GdkWindow. Patch by Tilman Sauerbeck from #2063820.
+
+2007-06-17  Daniel Elstner  <danielk@openismus.com>
+	
 	* modules/input/gtkimcontextmultipress.c (vfunc_filter_keypress):
 	Change input method behavior to act on key presses instead of
 	key releases, matching normal text input behavior.  This change
diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c
index acbc46345c..55b2040eed 100644
--- a/gdk/x11/gdkgeometry-x11.c
+++ b/gdk/x11/gdkgeometry-x11.c
@@ -246,7 +246,7 @@ gdk_window_copy_area_scroll (GdkWindow    *window,
 
   for (l = obj->children; l; l = l->next)
     {
-      GdkWindow *child = GDK_WINDOW (l->data);
+      GdkWindow *child = (GdkWindow*) l->data;
       GdkWindowObject *child_obj = GDK_WINDOW_OBJECT (child);
 
       gdk_window_move (child, child_obj->x + dx, child_obj->y + dy);
@@ -371,7 +371,7 @@ gdk_window_guffaw_scroll (GdkWindow    *window,
   
   for (l = obj->children; l; l = l->next)
     {
-      GdkWindow *child = GDK_WINDOW (l->data);
+      GdkWindow *child = (GdkWindow*) l->data;
       GdkWindowObject *child_obj = GDK_WINDOW_OBJECT (child);
 
       child_obj->x -= d_xoffset;