diff --git a/ChangeLog b/ChangeLog
index 537f4888e4..fde246309b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-05-23  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/gdk.symbols: Add gdk_window_redirect_to_drawable and
+	gdk_window_remove_redirection.
+
+	* gdk/win32/gdkwindow-win32.c (_gdk_window_new)
+	(_gdk_window_reparent): Rename to adapt to the offscreen rendering
+	changes. Remove now unnecessary parameter checks as the caller
+	does that already.
+
+	* gtk/gtk.symbols: Add gtk_widget_get_snapshot.
+
 2008-05-23  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/win32/gdkwindow-win32.c (update_style_bits): Don't do
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index fd12d472a0..c4c5e7093f 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -687,6 +687,8 @@ gdk_window_set_user_data
 gdk_window_thaw_toplevel_updates_libgtk_only
 gdk_window_thaw_updates
 gdk_window_set_composited
+gdk_window_redirect_to_drawable
+gdk_window_remove_redirection
 #endif
 #endif
 
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 2ead9ee946..09129d3f3f 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -508,7 +508,7 @@ gdk_window_new_internal (GdkWindow     *parent,
   orig_parent = parent;
 
   GDK_NOTE (MISC,
-	    g_print ("gdk_window_new: %s\n",
+	    g_print ("gdk_window_new_internal: %s\n",
 		     (attributes->window_type == GDK_WINDOW_TOPLEVEL ? "TOPLEVEL" :
 		      (attributes->window_type == GDK_WINDOW_CHILD ? "CHILD" :
 		       (attributes->window_type == GDK_WINDOW_DIALOG ? "DIALOG" :
@@ -757,9 +757,9 @@ gdk_window_new_internal (GdkWindow     *parent,
 }
 
 GdkWindow*
-gdk_window_new (GdkWindow     *parent,
-		GdkWindowAttr *attributes,
-		gint           attributes_mask)
+_gdk_window_new (GdkWindow     *parent,
+		 GdkWindowAttr *attributes,
+		 gint           attributes_mask)
 {
   return gdk_window_new_internal (parent, attributes, attributes_mask, FALSE);
 }
@@ -1350,10 +1350,10 @@ gdk_window_move_resize (GdkWindow *window,
 }
 
 void
-gdk_window_reparent (GdkWindow *window,
-		     GdkWindow *new_parent,
-		     gint       x,
-		     gint       y)
+_gdk_window_reparent (GdkWindow *window,
+		      GdkWindow *new_parent,
+		      gint       x,
+		      gint       y)
 {
   GdkWindowObject *window_private;
   GdkWindowObject *parent_private;
@@ -1362,16 +1362,6 @@ gdk_window_reparent (GdkWindow *window,
   gboolean was_toplevel;
   LONG style;
 
-  g_return_if_fail (GDK_IS_WINDOW (window));
-  g_return_if_fail (new_parent == NULL || GDK_IS_WINDOW (new_parent));
-  g_return_if_fail (window != _gdk_root);
-
-  if (GDK_WINDOW_DESTROYED (window) ||
-      (new_parent && GDK_WINDOW_DESTROYED (new_parent)))
-    {
-      return;
-    }
-
   if (!new_parent)
     new_parent = _gdk_root;
 
@@ -1380,7 +1370,7 @@ gdk_window_reparent (GdkWindow *window,
   parent_private = (GdkWindowObject*) new_parent;
   impl = GDK_WINDOW_IMPL_WIN32 (window_private->impl);
 
-  GDK_NOTE (MISC, g_print ("gdk_window_reparent: %p: %p\n",
+  GDK_NOTE (MISC, g_print ("_gdk_window_reparent: %p: %p\n",
 			   GDK_WINDOW_HWND (window),
 			   GDK_WINDOW_HWND (new_parent)));
 
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 42b0a09ad1..42ca37f580 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -4816,6 +4816,7 @@ gtk_widget_unmap
 gtk_widget_unparent
 gtk_widget_unrealize
 gtk_widget_unref
+gtk_widget_get_snapshot
 #endif
 #endif