container: suggest parentheses around assignment used as truth value

[~andy/gtk] / gdk / directfb / gdkgeometry-directfb.c

diff --git a/gdk/directfb/gdkgeometry-directfb.c b/gdk/directfb/gdkgeometry-directfb.c
index bddc2dd76a7c42e5d124d0d542bdf29d50a869e3..85a39a2dca18a72d7acb559c4fc3e33dd2eb60d8 100644 (file)
--- a/gdk/directfb/gdkgeometry-directfb.c
+++ b/gdk/directfb/gdkgeometry-directfb.c
@@ -37,7 +37,6 @@
 #include "gdkprivate-directfb.h"
 
 #include "gdkinternals.h"
-#include "gdkalias.h"
 
 
 void
@@ -53,7 +52,7 @@ _gdk_directfb_window_get_offsets (GdkWindow *window,
 
 gboolean
 _gdk_windowing_window_queue_antiexpose (GdkWindow *window,
-                                        GdkRegion *area)
+                                        cairo_region_t *area)
 {
   return FALSE;
 }
@@ -75,7 +74,7 @@ _gdk_directfb_window_scroll (GdkWindow *window,
 {
   GdkWindowObject         *private;
   GdkDrawableImplDirectFB *impl;
-  GdkRegion               *invalidate_region = NULL;
+  cairo_region_t               *invalidate_region = NULL;
   GList                   *list;
 
   g_return_if_fail (GDK_IS_WINDOW (window));
@@ -104,7 +103,7 @@ _gdk_directfb_window_scroll (GdkWindow *window,
           (!private->update_area ||
            !cairo_region_contains_rectangle (private->update_area, &rect)))
         {
-          GdkRegion *region;
+          cairo_region_t *region;
 
           region = cairo_region_create_rectangle (&rect);
           cairo_region_subtract (invalidate_region, region);
@@ -148,7 +147,7 @@ _gdk_directfb_window_scroll (GdkWindow *window,
 /**
  * gdk_window_move_region:
  * @window: a #GdkWindow
- * @region: The #GdkRegion to move
+ * @region: The #cairo_region_t to move
  * @dx: Amount to move in the X direction
  * @dy: Amount to move in the Y direction
  * 
@@ -162,17 +161,17 @@ _gdk_directfb_window_scroll (GdkWindow *window,
  **/
 void
 _gdk_directfb_window_move_region (GdkWindow       *window,
-                                  const GdkRegion *region,
+                                  const cairo_region_t *region,
                                   gint             dx,
                                   gint             dy)
 {
   GdkWindowObject         *private;
   GdkDrawableImplDirectFB *impl;
-  GdkRegion *window_clip;
-  GdkRegion *src_region;
-  GdkRegion *brought_in;
-  GdkRegion *dest_region;
-  GdkRegion *moving_invalid_region;
+  cairo_region_t *window_clip;
+  cairo_region_t *src_region;
+  cairo_region_t *brought_in;
+  cairo_region_t *dest_region;
+  cairo_region_t *moving_invalid_region;
   GdkRectangle dest_extents;
   
   g_return_if_fail (GDK_IS_WINDOW (window));
@@ -253,6 +252,3 @@ _gdk_directfb_window_move_region (GdkWindow       *window,
   cairo_region_destroy (src_region);
   cairo_region_destroy (dest_region);
 }
-
-#define __GDK_GEOMETRY_X11_C__
-#include "gdkaliasdef.c"