aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@novell.com>2004-09-24 21:54:21 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-09-24 21:54:21 +0800
commit6768cadd8d66cbb219636d844f50c1fedcc8a510 (patch)
tree45b240798945cbd6329068be73a2967050f7f283
parent4102ebe1acbc552bdf7ffcc827f25688a7c3e1aa (diff)
downloadgsoc2013-evolution-6768cadd8d66cbb219636d844f50c1fedcc8a510.tar
gsoc2013-evolution-6768cadd8d66cbb219636d844f50c1fedcc8a510.tar.gz
gsoc2013-evolution-6768cadd8d66cbb219636d844f50c1fedcc8a510.tar.bz2
gsoc2013-evolution-6768cadd8d66cbb219636d844f50c1fedcc8a510.tar.lz
gsoc2013-evolution-6768cadd8d66cbb219636d844f50c1fedcc8a510.tar.xz
gsoc2013-evolution-6768cadd8d66cbb219636d844f50c1fedcc8a510.tar.zst
gsoc2013-evolution-6768cadd8d66cbb219636d844f50c1fedcc8a510.zip
Fixes #66344
2004-09-24 JP Rosevear <jpr@novell.com> Fixes #66344 * gui/e-cal-model-calendar.c (get_dtend): check for existence of property and null time instead of sending through bad data * gui/e-cal-model.c (get_dtstart): ditto * gui/e-cal-model-tasks.c (get_completed): ditto (get_due): ditto svn path=/trunk/; revision=27368
-rw-r--r--calendar/ChangeLog12
-rw-r--r--calendar/gui/e-cal-model-calendar.c14
-rw-r--r--calendar/gui/e-cal-model-tasks.c4
-rw-r--r--calendar/gui/e-cal-model.c10
4 files changed, 32 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 5a058fe8ab..5816c90ad4 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+2004-09-24 JP Rosevear <jpr@novell.com>
+
+ Fixes #66344
+
+ * gui/e-cal-model-calendar.c (get_dtend): check for existence of
+ property and null time instead of sending through bad data
+
+ * gui/e-cal-model.c (get_dtstart): ditto
+
+ * gui/e-cal-model-tasks.c (get_completed): ditto
+ (get_due): ditto
+
2004-09-24 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #63513
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index 479f51fbd6..63532c5be8 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -112,20 +112,26 @@ ecmc_column_count (ETableModel *etm)
}
static ECellDateEditValue *
-get_dtend (ECalModel *model, ECalModelComponent *comp_data)
+get_dtend (ECalModelCalendar *model, ECalModelComponent *comp_data)
{
struct icaltimetype tt_end;
if (!comp_data->dtend) {
+ icalproperty *prop;
icaltimezone *zone;
gboolean got_zone = FALSE;
- tt_end = icalcomponent_get_dtend (comp_data->icalcomp);
+ prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DTEND_PROPERTY);
+ if (!prop)
+ return NULL;
+
+ tt_end = icalproperty_get_dtend (prop);
+
if (icaltime_get_tzid (tt_end)
&& e_cal_get_timezone (comp_data->client, icaltime_get_tzid (tt_end), &zone, NULL))
got_zone = TRUE;
- if ((e_cal_model_get_flags (model) & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES) &&
+ if ((e_cal_model_get_flags (E_CAL_MODEL (model)) & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES) &&
(e_cal_util_component_has_recurrences (comp_data->icalcomp))) {
if (got_zone)
tt_end = icaltime_from_timet_with_zone (comp_data->instance_end, tt_end.is_date, zone);
@@ -133,7 +139,7 @@ get_dtend (ECalModel *model, ECalModelComponent *comp_data)
tt_end = icaltime_from_timet (comp_data->instance_end, tt_end.is_date);
}
- if (!icaltime_is_valid_time (tt_end))
+ if (!icaltime_is_valid_time (tt_end) || icaltime_is_null_time (tt_end))
return NULL;
comp_data->dtend = g_new0 (ECellDateEditValue, 1);
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index fe162cc388..508406c80d 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -242,7 +242,7 @@ get_completed (ECalModelComponent *comp_data)
return NULL;
tt_completed = icalproperty_get_completed (prop);
- if (!icaltime_is_valid_time (tt_completed))
+ if (!icaltime_is_valid_time (tt_completed) || icaltime_is_null_time (tt_completed))
return NULL;
comp_data->completed = g_new0 (ECellDateEditValue, 1);
@@ -272,7 +272,7 @@ get_due (ECalModelComponent *comp_data)
return NULL;
tt_due = icalproperty_get_due (prop);
- if (!icaltime_is_valid_time (tt_due))
+ if (!icaltime_is_valid_time (tt_due) || icaltime_is_null_time (tt_due))
return NULL;
comp_data->due = g_new0 (ECellDateEditValue, 1);
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 59530dfee7..87f23b2f45 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -401,10 +401,16 @@ get_dtstart (ECalModel *model, ECalModelComponent *comp_data)
priv = model->priv;
if (!comp_data->dtstart) {
+ icalproperty *prop;
icaltimezone *zone;
gboolean got_zone = FALSE;
- tt_start = icalcomponent_get_dtstart (comp_data->icalcomp);
+ prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DTSTART_PROPERTY);
+ if (!prop)
+ return NULL;
+
+ tt_start = icalproperty_get_dtstart (prop);
+
if (icaltime_get_tzid (tt_start)
&& e_cal_get_timezone (comp_data->client, icaltime_get_tzid (tt_start), &zone, NULL))
got_zone = TRUE;
@@ -417,7 +423,7 @@ get_dtstart (ECalModel *model, ECalModelComponent *comp_data)
tt_start = icaltime_from_timet (comp_data->instance_start, tt_start.is_date);
}
- if (!icaltime_is_valid_time (tt_start))
+ if (!icaltime_is_valid_time (tt_start) || icaltime_is_null_time (tt_start))
return NULL;
comp_data->dtstart = g_new0 (ECellDateEditValue, 1);