aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog4
-rw-r--r--calendar/gui/e-cal-model-tasks.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index aca86d31e3..64cf4f35a2 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,9 @@
2004-01-14 Rodrigo Moya <rodrigo@ximian.com>
+ * gui/e-cal-model-tasks.c (get_status): removed assertion.
+
+2004-01-14 Rodrigo Moya <rodrigo@ximian.com>
+
* common/authentication.c (auth_new_cal_from_source): check
return value from e_cal_new().
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 2251ec7f88..33cb315038 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -324,8 +324,7 @@ get_status (ECalModelComponent *comp_data)
case ICAL_STATUS_CANCELLED:
return _("Cancelled");
default:
- g_assert_not_reached ();
- return NULL;
+ return "";
}
}