1 files changed, 13 insertions, 14 deletions

diff --git a/gdk/directfb/gdkdrawable-directfb.c b/gdk/directfb/gdkdrawable-directfb.c
index da314e54a2..eb859ef4f5 100644
--- a/gdk/directfb/gdkdrawable-directfb.c
+++ b/gdk/directfb/gdkdrawable-directfb.c
@@ -44,7 +44,6 @@
 #include "gdkinternals.h"
 
 
-#include "gdkregion-generic.h"
 #include "gdkalias.h"
 
 #include "cairo-directfb.h"
@@ -226,7 +225,7 @@ void
 gdk_directfb_clip_region (GdkDrawable  *drawable,
                           GdkGC        *gc,
                           GdkRectangle *draw_rect,
-                          GdkRegion    *ret_clip)
+                          cairo_region_t    *ret_clip)
 {
   GdkDrawableImplDirectFB *private;
   GdkRectangle             rect;
@@ -264,7 +263,7 @@ gdk_directfb_clip_region (GdkDrawable  *drawable,
   if (gc)
     {
       GdkGCDirectFB *gc_private = GDK_GC_DIRECTFB (gc);
-      GdkRegion     *region     = &gc_private->clip_region;
+      cairo_region_t     *region     = &gc_private->clip_region;
 
       if (region->numRects)
         {
@@ -299,7 +298,7 @@ gdk_directfb_clip_region (GdkDrawable  *drawable,
       !GDK_WINDOW_OBJECT (private->wrapper)->input_only)
     {
       GList     *cur;
-      GdkRegion  temp;
+      cairo_region_t  temp;
 
       temp.numRects = 1;
       temp.rects = &temp.extents;
@@ -428,7 +427,7 @@ gdk_directfb_draw_rectangle (GdkDrawable *drawable,
                              gint         height)
 {
   GdkDrawableImplDirectFB *impl;
-  GdkRegion                clip;
+  cairo_region_t                clip;
   GdkGCDirectFB           *gc_private = NULL;
   IDirectFBSurface        *surface    = NULL;
   gint  i;
@@ -543,7 +542,7 @@ gdk_directfb_draw_rectangle (GdkDrawable *drawable,
 
           for (i = 0; i < clip.numRects; i++)
             {
-              GdkRegionBox *box = &clip.rects[i];
+              cairo_region_tBox *box = &clip.rects[i];
 
               rects[i].x = box->x1;
               rects[i].y = box->y1;
@@ -606,7 +605,7 @@ gdk_directfb_draw_polygon (GdkDrawable *drawable,
                                  points[0].y == points[npoints-1].y))
           {
             GdkDrawableImplDirectFB *impl;
-            GdkRegion                clip;
+            cairo_region_t                clip;
             gint                     i;
 
             impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
@@ -671,7 +670,7 @@ gdk_directfb_draw_drawable (GdkDrawable *drawable,
 {
   GdkDrawableImplDirectFB *impl;
   GdkDrawableImplDirectFB *src_impl;
-  GdkRegion                clip;
+  cairo_region_t                clip;
   GdkRectangle             dest_rect = { xdest,
                                          ydest,
                 xdest + width ,
@@ -721,7 +720,7 @@ gdk_directfb_draw_points (GdkDrawable *drawable,
                           gint         npoints)
 {
   GdkDrawableImplDirectFB *impl;
-  GdkRegion                clip;
+  cairo_region_t                clip;
 
   DFBRegion region = { points->x, points->y, points->x, points->y };
 
@@ -769,7 +768,7 @@ gdk_directfb_draw_segments (GdkDrawable *drawable,
                             gint         nsegs)
 {
   GdkDrawableImplDirectFB *impl;
-  GdkRegion                clip;
+  cairo_region_t                clip;
   gint                     i;
 
 //  DFBRegion region = { segs->x1, segs->y1, segs->x2, segs->y2 };
@@ -847,7 +846,7 @@ gdk_directfb_draw_lines (GdkDrawable *drawable,
                          gint         npoints)
 {
   GdkDrawableImplDirectFB *impl;
-  GdkRegion                clip;
+  cairo_region_t                clip;
   gint                     i;
 
   DFBRegion lines[npoints > 1 ? npoints - 1 : 1];
@@ -920,7 +919,7 @@ gdk_directfb_draw_image (GdkDrawable *drawable,
 {
   GdkDrawableImplDirectFB *impl;
   GdkImageDirectFB        *image_private;
-  GdkRegion                clip;
+  cairo_region_t                clip;
   GdkRectangle             dest_rect = { xdest, ydest, width, height };
 
   gint pitch = 0;
@@ -1156,8 +1155,8 @@ gdk_directfb_draw_pixbuf (GdkDrawable  *drawable,
 {
   GdkPixbuf *composited = NULL;
 #if 0
-  GdkRegion *clip;
-  GdkRegion *drect;
+  cairo_region_t *clip;
+  cairo_region_t *drect;
   GdkRectangle tmp_rect;
 #endif
   GdkDrawableImplDirectFB *impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);