aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@ximian.com>2001-07-18 09:07:20 +0800
committerRodrigo Moya <rodrigo@src.gnome.org>2001-07-18 09:07:20 +0800
commit0e03733290dff59622b64fc332d75f9c217ec2b8 (patch)
treefc1a58b8058ecdbbc37ea228b904a532f975e318
parenteda30c6ad6792323a4d7efb51e728b3715b6e2e2 (diff)
downloadgsoc2013-evolution-0e03733290dff59622b64fc332d75f9c217ec2b8.tar.gz
gsoc2013-evolution-0e03733290dff59622b64fc332d75f9c217ec2b8.tar.zst
gsoc2013-evolution-0e03733290dff59622b64fc332d75f9c217ec2b8.zip
do not discard drawing icon if mask is NULL
2001-07-18 Rodrigo Moya <rodrigo@ximian.com> * gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event): do not discard drawing icon if mask is NULL * gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event): ditto svn path=/trunk/; revision=11190
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/e-day-view-main-item.c2
-rw-r--r--calendar/gui/e-day-view-top-item.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 4c1ad87a0c..3dce06c2aa 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-18 Rodrigo Moya <rodrigo@ximian.com>
+
+ * gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
+ do not discard drawing icon if mask is NULL
+
+ * gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
+ ditto
+
2001-07-17 JP Rosevear <jpr@ximian.com>
* gui/e-itip-control.c (get_next): find the next displayable
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index d65193b08b..79ee0b0826 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -668,7 +668,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
category = (char *) elem->data;
e_categories_config_get_icon_for (category, &pixmap, &mask);
- if (pixmap == NULL || mask == NULL)
+ if (pixmap == NULL)
continue;
max_icon_w = item_x + item_w - icon_x
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index 237e7589ba..10b1cd0b13 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -589,7 +589,7 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
category = (char *) elem->data;
e_categories_config_get_icon_for (category, &pixmap, &mask);
- if (pixmap == NULL || mask == NULL)
+ if (pixmap == NULL)
continue;
if (icon_x <= max_icon_x) {