aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog9
-rw-r--r--calendar/gui/e-day-view-main-item.c3
-rw-r--r--calendar/gui/e-day-view-top-item.c3
-rw-r--r--calendar/gui/e-week-view-event-item.c3
4 files changed, 15 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 91a3fe1244..6cc877cb78 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-08 Rodrigo Moya <rodrigo@ximian.com>
+
+ * gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
+ don't use a NULL mask in the call to gdk_gc_set_clip_mask
+
+ * gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event): ditto
+
+ * gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event): ditto
+
2001-08-08 JP Rosevear <jpr@ximian.com>
* conduits/calendar/calendar-conduit-config.h: fix pre-processor
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 5dab65b7f8..54b0baff3a 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -694,7 +694,8 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
- E_DAY_VIEW_EVENT_BORDER_HEIGHT;
gdk_gc_set_clip_origin (gc, icon_x, icon_y);
- gdk_gc_set_clip_mask (gc, mask);
+ if (mask != NULL)
+ gdk_gc_set_clip_mask (gc, mask);
gdk_draw_pixmap (drawable, gc,
pixmap,
0, 0, icon_x, icon_y,
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index e7a3aad90b..5c479fc020 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -594,7 +594,8 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
if (icon_x <= max_icon_x) {
gdk_gc_set_clip_origin (gc, icon_x, icon_y);
- gdk_gc_set_clip_mask (gc, mask);
+ if (mask != NULL)
+ gdk_gc_set_clip_mask (gc, mask);
gdk_draw_pixmap (drawable, gc,
pixmap,
0, 0, icon_x, icon_y,
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 7726f6b445..f304bc9d45 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -641,7 +641,8 @@ e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem,
if (icon_x + E_WEEK_VIEW_ICON_WIDTH <= x2) {
gdk_gc_set_clip_origin (gc, icon_x, icon_y);
- gdk_gc_set_clip_mask (gc, mask);
+ if (mask != NULL)
+ gdk_gc_set_clip_mask (gc, mask);
gdk_draw_pixmap (drawable, gc,
pixmap,
0, 0, icon_x, icon_y,