diff options
| author | Damon Chaplin <damon@ximian.com> | 2001-10-24 05:36:35 +0800 |
|---|---|---|
| committer | Damon Chaplin <damon@src.gnome.org> | 2001-10-24 05:36:35 +0800 |
| commit | 1451bdffda8a87d6053519ab868ff778d7fb0e01 (patch) | |
| tree | 429ee52ed2d6873ab5c3a43226997cf25ecdabba /calendar/cal-util | |
| parent | 1bf22141608121ef5d1b9f9d354b14068999fc8a (diff) | |
| download | gsoc2013-evolution-1451bdffda8a87d6053519ab868ff778d7fb0e01.tar.gz gsoc2013-evolution-1451bdffda8a87d6053519ab868ff778d7fb0e01.tar.zst gsoc2013-evolution-1451bdffda8a87d6053519ab868ff778d7fb0e01.zip | |
make sure we free all the CalComponentDateTime's when we are finished.
2001-10-23 Damon Chaplin <damon@ximian.com>
* cal-util/cal-component.c (cal_component_event_dates_match): make sure
we free all the CalComponentDateTime's when we are finished.
* gui/gnome-cal.c (gnome_calendar_notify_dates_shown_changed): just
return if no time range is set.
svn path=/trunk/; revision=13957
Diffstat (limited to 'calendar/cal-util')
| -rw-r--r-- | calendar/cal-util/cal-component.c | 45 |
1 files changed, 32 insertions, 13 deletions
diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c index fb7c30f95b..58e1d4a945 100644 --- a/calendar/cal-util/cal-component.c +++ b/calendar/cal-util/cal-component.c @@ -4991,6 +4991,7 @@ cal_component_event_dates_match (CalComponent *comp1, { CalComponentDateTime comp1_dtstart, comp1_dtend; CalComponentDateTime comp2_dtstart, comp2_dtend; + gboolean retval = TRUE; cal_component_get_dtstart (comp1, &comp1_dtstart); cal_component_get_dtend (comp1, &comp1_dtend); @@ -4999,32 +5000,50 @@ cal_component_event_dates_match (CalComponent *comp1, /* If either value is NULL they must both be NULL to match. */ if (comp1_dtstart.value == NULL || comp2_dtstart.value == NULL) { - if (comp1_dtstart.value != comp2_dtstart.value) - return FALSE; + if (comp1_dtstart.value != comp2_dtstart.value) { + retval = FALSE; + goto out; + } } else { if (icaltime_compare (*comp1_dtstart.value, - *comp2_dtstart.value)) - return FALSE; + *comp2_dtstart.value)) { + retval = FALSE; + goto out; + } } if (comp1_dtend.value == NULL || comp2_dtend.value == NULL) { - if (comp1_dtend.value != comp2_dtend.value) - return FALSE; + if (comp1_dtend.value != comp2_dtend.value) { + retval = FALSE; + goto out; + } } else { if (icaltime_compare (*comp1_dtend.value, - *comp2_dtend.value)) - return FALSE; + *comp2_dtend.value)) { + retval = FALSE; + goto out; + } } /* Now check the timezones. */ if (!cal_component_strings_match (comp1_dtstart.tzid, - comp2_dtstart.tzid)) - return FALSE; + comp2_dtstart.tzid)) { + retval = FALSE; + goto out; + } if (!cal_component_strings_match (comp1_dtend.tzid, - comp2_dtend.tzid)) - return FALSE; + comp2_dtend.tzid)) { + retval = FALSE; + } - return TRUE; + out: + + cal_component_free_datetime (&comp1_dtstart); + cal_component_free_datetime (&comp1_dtend); + cal_component_free_datetime (&comp2_dtstart); + cal_component_free_datetime (&comp2_dtend); + + return retval; } |