gnome-canvas: Convert canvas item transformation matrix to cairo

Also update the GnomeCanvasItem.update vfunc to take a cairo_matrix_t
and no longer pass the clip_path (what was it used for anyway?).

7 files changed, 19 insertions, 25 deletions

diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 33e45bbef3..0383d3b112 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -980,15 +980,14 @@ day_view_main_item_dispose (GObject *object)
 
 static void
 day_view_main_item_update (GnomeCanvasItem *item,
-			   gdouble *affine,
-			   ArtSVP *clip_path,
+			   const cairo_matrix_t *i2c,
 			   gint flags)
 {
 	GnomeCanvasItemClass *canvas_item_class;
 
 	/* Chain up to parent's update() method. */
 	canvas_item_class = GNOME_CANVAS_ITEM_CLASS (parent_class);
-	canvas_item_class->update (item, affine, clip_path, flags);
+	canvas_item_class->update (item, i2c, flags);
 
 	/* The item covers the entire canvas area. */
 	item->x1 = 0;
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index e952515c89..e163e278ac 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -74,8 +74,8 @@ struct _EDayViewTimeItemPrivate {
 };
 
 static void e_day_view_time_item_update (GnomeCanvasItem *item,
-					 double *affine,
-					 ArtSVP *clip_path, gint flags);
+					 const cairo_matrix_t *i2c,
+					 gint flags);
 static void e_day_view_time_item_draw (GnomeCanvasItem *item,
 				       GdkDrawable *drawable,
 				       gint x, gint y,
@@ -257,12 +257,11 @@ e_day_view_time_item_get_type (void)
 
 static void
 e_day_view_time_item_update (GnomeCanvasItem *item,
-			    double *affine,
-			    ArtSVP *clip_path,
-			    gint flags)
+			     const cairo_matrix_t *i2c,
+			     gint flags)
 {
 	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
+		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, i2c, flags);
 
 	/* The item covers the entire canvas area. */
 	item->x1 = 0;
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index 41a2b665df..126f9833f8 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -576,15 +576,14 @@ day_view_top_item_dispose (GObject *object)
 
 static void
 day_view_top_item_update (GnomeCanvasItem *item,
-                          gdouble *affine,
-                          ArtSVP *clip_path,
+                          const cairo_matrix_t *i2c,
                           gint flags)
 {
 	GnomeCanvasItemClass *canvas_item_class;
 
 	/* Chain up to parent's update() method. */
 	canvas_item_class = GNOME_CANVAS_ITEM_CLASS (parent_class);
-	canvas_item_class->update (item, affine, clip_path, flags);
+	canvas_item_class->update (item, i2c, flags);
 
 	/* The item covers the entire canvas area. */
 	item->x1 = 0;
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index 18b21949a1..2f70747cd8 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -48,8 +48,8 @@ static void e_meeting_time_selector_item_set_property (GObject *object,
 static void e_meeting_time_selector_item_realize (GnomeCanvasItem *item);
 static void e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item);
 static void e_meeting_time_selector_item_update (GnomeCanvasItem *item,
-						 double *affine,
-						 ArtSVP *clip_path, gint flags);
+						 const cairo_matrix_t *i2c,
+						 gint flags);
 static void e_meeting_time_selector_item_draw (GnomeCanvasItem *item,
 					       GdkDrawable *drawable,
 					       gint x, gint y,
@@ -221,10 +221,10 @@ e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item)
 }
 
 static void
-e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags)
+e_meeting_time_selector_item_update (GnomeCanvasItem *item, const cairo_matrix_t *i2c, gint flags)
 {
 	if (GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->update) (item, affine, clip_path, flags);
+		(* GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->update) (item, i2c, flags);
 
 	/* The grid covers the entire canvas area. */
 	item->x1 = 0;
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 8309dcd8dc..c03f991349 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -666,8 +666,7 @@ week_view_event_item_get_property (GObject *object,
 
 static void
 week_view_event_item_update (GnomeCanvasItem *item,
-                             gdouble *affine,
-                             ArtSVP *clip_path,
+                             const cairo_matrix_t *i2c,
                              gint flags)
 {
 	GnomeCanvasItemClass *canvas_item_class;
@@ -685,7 +684,7 @@ week_view_event_item_update (GnomeCanvasItem *item,
 
 	/* Chain up to parent's update() method. */
 	canvas_item_class = GNOME_CANVAS_ITEM_CLASS (parent_class);
-	canvas_item_class->update (item, affine, clip_path, flags);
+	canvas_item_class->update (item, i2c, flags);
 
 	item->x1 = 0;
 	item->y1 = 0;
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index 5d09d45660..32365040af 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -354,15 +354,14 @@ week_view_main_item_dispose (GObject *object)
 
 static void
 week_view_main_item_update (GnomeCanvasItem *item,
-                            gdouble *affine,
-                            ArtSVP *clip_path,
+                            const cairo_matrix_t *i2c,
                             gint flags)
 {
 	GnomeCanvasItemClass *canvas_item_class;
 
 	/* Chain up to parent's update() method. */
 	canvas_item_class = GNOME_CANVAS_ITEM_CLASS (parent_class);
-	canvas_item_class->update (item, affine, clip_path, flags);
+	canvas_item_class->update (item, i2c, flags);
 
 	/* The item covers the entire canvas area. */
 	item->x1 = 0;
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index 2e058d1056..91fe23336a 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -97,15 +97,14 @@ week_view_titles_item_dispose (GObject *object)
 
 static void
 week_view_titles_item_update (GnomeCanvasItem *item,
-                              gdouble *affine,
-                              ArtSVP *clip_path,
+                              const cairo_matrix_t *i2c,
                               gint flags)
 {
 	GnomeCanvasItemClass *canvas_item_class;
 
 	/* Chain up to parent's update() method. */
 	canvas_item_class = GNOME_CANVAS_ITEM_CLASS (parent_class);
-	canvas_item_class->update (item, affine, clip_path, flags);
+	canvas_item_class->update (item, i2c, flags);
 
 	/* The item covers the entire canvas area. */
 	item->x1 = 0;