[evolution/gtk3] canvas: Remove GNOME_CANVAS_ITEM_ALWAYS_REDRAW flag

[Benjamin Otte <otte src gnome org>]

commit efa483e6f2b0bbe02e6a8a9353ef0d2d9375fac7
Author: Benjamin Otte <otte redhat com>
Date:   Fri Jan 21 05:13:07 2011 +0100

    canvas: Remove GNOME_CANVAS_ITEM_ALWAYS_REDRAW flag

 libgnomecanvas/gnome-canvas.c |   16 +++++-----------
 libgnomecanvas/gnome-canvas.h |   11 +++++------
 2 files changed, 10 insertions(+), 17 deletions(-)
---
diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c
index e350ba6..41e8085 100644
--- a/libgnomecanvas/gnome-canvas.c
+++ b/libgnomecanvas/gnome-canvas.c
@@ -1501,17 +1501,11 @@ gnome_canvas_group_draw (GnomeCanvasItem *item,
 	for (list = group->item_list; list; list = list->next) {
 		child = list->data;
 
-		if (((child->flags & GNOME_CANVAS_ITEM_VISIBLE)
-		     && ((child->x1 < (x + width))
-			 && (child->y1 < (y + height))
-			 && (child->x2 > x)
-			 && (child->y2 > y)))
-		    || ((child->flags & GNOME_CANVAS_ITEM_ALWAYS_REDRAW)
-			&& (child->x1 < child->canvas->redraw_x2)
-			&& (child->y1 < child->canvas->redraw_y2)
-			&& (child->x2 > child->canvas->redraw_x1)
-			&& (child->y2 > child->canvas->redraw_y2))) {
-
+		if ((child->flags & GNOME_CANVAS_ITEM_VISIBLE)
+		    && ((child->x1 < (x + width))
+		    && (child->y1 < (y + height))
+	            && (child->x2 > x)
+		    && (child->y2 > y))) {
 			cairo_save (cr);
 
 			GNOME_CANVAS_ITEM_GET_CLASS (child)->draw (
diff --git a/libgnomecanvas/gnome-canvas.h b/libgnomecanvas/gnome-canvas.h
index a239675..66fa8d1 100644
--- a/libgnomecanvas/gnome-canvas.h
+++ b/libgnomecanvas/gnome-canvas.h
@@ -84,12 +84,11 @@ typedef struct _GnomeCanvasGroupClass GnomeCanvasGroupClass;
 typedef enum {
 	GNOME_CANVAS_ITEM_REALIZED      = 1 << 0,
 	GNOME_CANVAS_ITEM_MAPPED        = 1 << 1,
-	GNOME_CANVAS_ITEM_ALWAYS_REDRAW = 1 << 2,
-	GNOME_CANVAS_ITEM_VISIBLE       = 1 << 3,
-	GNOME_CANVAS_ITEM_NEED_UPDATE	= 1 << 4,
-	GNOME_CANVAS_ITEM_NEED_AFFINE	= 1 << 5,
-	GNOME_CANVAS_ITEM_NEED_CLIP	= 1 << 6,
-	GNOME_CANVAS_ITEM_NEED_VIS	= 1 << 7
+	GNOME_CANVAS_ITEM_VISIBLE       = 1 << 2,
+	GNOME_CANVAS_ITEM_NEED_UPDATE	= 1 << 3,
+	GNOME_CANVAS_ITEM_NEED_AFFINE	= 1 << 4,
+	GNOME_CANVAS_ITEM_NEED_CLIP	= 1 << 5,
+	GNOME_CANVAS_ITEM_NEED_VIS	= 1 << 6
 } GnomeCanvasItemFlags;
 
 /* Update flags for items */