diff --git a/ChangeLog b/ChangeLog
index 35b6436b81..394e6bf230 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 25 10:35:23 PST 2006  Michael Emmel  <mike.emmel@gmail.com>
+	*gdk/directfb/gdkdisplay-directfb.c
+	*gdk/directfb/gdkwindow-directfb.c
+	Added stubs for shape window functions to fix compile problems
+
 2006-02-24  Federico Mena Quintero  <federico@novell.com>
 
 	* gtk/gtkfilechooserdefault.c (shortcuts_list_create): Make the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 35b6436b81..394e6bf230 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Feb 25 10:35:23 PST 2006  Michael Emmel  <mike.emmel@gmail.com>
+	*gdk/directfb/gdkdisplay-directfb.c
+	*gdk/directfb/gdkwindow-directfb.c
+	Added stubs for shape window functions to fix compile problems
+
 2006-02-24  Federico Mena Quintero  <federico@novell.com>
 
 	* gtk/gtkfilechooserdefault.c (shortcuts_list_create): Make the
diff --git a/gdk/directfb/TODO b/gdk/directfb/TODO
index 619f247482..db0eb77b02 100644
--- a/gdk/directfb/TODO
+++ b/gdk/directfb/TODO
@@ -52,3 +52,7 @@ gdkwindow-directfb.c
 gdkwindowid.c
 glyphsurfacecache.c
 
+
+NOTES:
+event filter callbacks missing see the x11 impl
+
diff --git a/gdk/directfb/gdkdisplay-directfb.c b/gdk/directfb/gdkdisplay-directfb.c
index 5882bfe2e3..16cf8860b3 100644
--- a/gdk/directfb/gdkdisplay-directfb.c
+++ b/gdk/directfb/gdkdisplay-directfb.c
@@ -260,22 +260,24 @@ gdk_display_store_clipboard (GdkDisplay *display,
 
 }
 
-/**
- * gdk_display_get_default_group:
- * @display: a #GdkDisplay
- *
- * Returns the default group leader window for all toplevel windows
- * on @display. This window is implicitly created by GDK.
- * See gdk_window_set_group().
- *
- * Return value: The default group leader window for @display
- *
- * Since: 2.4
- **/
+
+gboolean
+gdk_display_supports_shapes (GdkDisplay *display)
+{
+       return FALSE;
+}
+
+
+gboolean
+gdk_display_supports_input_shapes (GdkDisplay *display)
+{
+       return FALSE;
+}
+
+
 GdkWindow *gdk_display_get_default_group (GdkDisplay *display)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-  g_warning(" gdk_display_get_default_group unimplemented \n");
   return  _gdk_parent_root;
 }
 
diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c
index 9da6e001f0..0394934075 100644
--- a/gdk/directfb/gdkwindow-directfb.c
+++ b/gdk/directfb/gdkwindow-directfb.c
@@ -1901,13 +1901,14 @@ gdk_window_shape_combine_mask (GdkWindow *window,
                                gint       x,
                                gint       y)
 {
-  static gboolean first_call = TRUE;
+}
 
-  if (first_call)
-    {
-      g_message ("unimplemented %s", G_GNUC_FUNCTION);
-      first_call = FALSE;
-    }
+void
+gdk_window_input_shape_combine_mask (GdkWindow *window,
+                                    GdkBitmap *mask,
+                                    gint       x,
+                                    gint       y)
+{
 }
 
 void
@@ -1916,13 +1917,14 @@ gdk_window_shape_combine_region (GdkWindow *window,
                                  gint       offset_x,
                                  gint       offset_y)
 {
-  g_return_if_fail (GDK_IS_WINDOW (window));
+}
 
-  if (GDK_WINDOW_DESTROYED (window))
-    return;
-
-  /* N/A */
-  g_message("unimplemented %s", G_GNUC_FUNCTION);
+void
+gdk_window_input_shape_combine_region (GdkWindow *window,
+                                      GdkRegion *shape_region,
+                                      gint       offset_x,
+                                      gint       offset_y)
+{
 }
 
 void
@@ -2240,25 +2242,21 @@ gdk_window_set_functions (GdkWindow     *window,
 void
 gdk_window_set_child_shapes (GdkWindow *window)
 {
-  g_return_if_fail (GDK_IS_WINDOW (window));
-
-  if (GDK_WINDOW_DESTROYED (window))
-    return;
-
-  /* N/A */
-  g_message("unimplemented %s", G_GNUC_FUNCTION);
 }
 
 void
 gdk_window_merge_child_shapes (GdkWindow *window)
 {
-  g_return_if_fail (GDK_IS_WINDOW (window));
+}
 
-  if (GDK_WINDOW_DESTROYED (window))
-    return;
+void
+gdk_window_set_child_input_shapes (GdkWindow *window)
+{
+}
 
-  /* N/A */
-  g_message("unimplemented %s", G_GNUC_FUNCTION);
+void
+gdk_window_merge_child_input_shapes (GdkWindow *window)
+{
 }
 
 gboolean