diff options
| author | Federico Mena Quintero <federico@helixcode.com> | 2000-12-20 02:12:57 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2000-12-20 02:12:57 +0800 |
| commit | de861766eded0c80ffbe050088043a16d7e4923f (patch) | |
| tree | 5010fda36af306efaab59e11ebfa12b7bd43023a /calendar/pcs/cal-backend-file.c | |
| parent | 20dabfff3014eb67b5c930345e8cb64116dba374 (diff) | |
| download | gsoc2013-evolution-de861766eded0c80ffbe050088043a16d7e4923f.tar.gz gsoc2013-evolution-de861766eded0c80ffbe050088043a16d7e4923f.tar.zst gsoc2013-evolution-de861766eded0c80ffbe050088043a16d7e4923f.zip | |
Fix confusion in the way the range is expanded.
2000-12-19 Federico Mena Quintero <federico@helixcode.com>
* pcs/cal-backend-file.c (compute_alarm_range): Fix confusion in
the way the range is expanded.
* cal-util/cal-component.c (cal_component_alarms_free): Doh,
alarms->alarms is a list, not a generic pointer. Free it properly.
(cal_component_free_pilot_id): Removed unused function.
(cal_component_free_pilot_status): Likewise.
* gui/main.c (init_bonobo): Use VERSION instead of a hardcoded
string. Pass argc by value, not by reference. Test the return
value of gnome_init_with_popt_table().
* cal-client/cal-client.c (cal_client_free_alarms): Oops, missed
implementing this function.
* cal-util/timeutil.c (print_time_t): Better printing format.
(isodiff_to_secs): Removed unused function.
(isodiff_from_secs): Removed unused function.
(time_day_end): Removed crufty part.
(time_day_begin): Removed crufty part.
(time_day_hour): Removed unused function.
(format_simple_hour): Removed unused function.
(get_time_t_hour): Removed unused function.
(time_from_start_duration): Removed unused function.
* cal-util/timeutil.h (parse_date): Removed unimplemented, unused
function prototype.
svn path=/trunk/; revision=7083
Diffstat (limited to 'calendar/pcs/cal-backend-file.c')
| -rw-r--r-- | calendar/pcs/cal-backend-file.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/calendar/pcs/cal-backend-file.c b/calendar/pcs/cal-backend-file.c index 85026a861a..4de8c8a4a2 100644 --- a/calendar/pcs/cal-backend-file.c +++ b/calendar/pcs/cal-backend-file.c @@ -958,24 +958,14 @@ compute_alarm_range (CalComponent *comp, GList *alarm_uids, time_t start, time_t continue; case CAL_ALARM_TRIGGER_RELATIVE_START: - dur = &trigger.u.rel_duration; - dur_time = icaldurationtype_as_timet (*dur); - - if (dur->is_neg) - *alarm_start = MIN (*alarm_start, start - dur_time); - else - *alarm_end = MAX (*alarm_end, start + dur_time); - - break; - case CAL_ALARM_TRIGGER_RELATIVE_END: dur = &trigger.u.rel_duration; dur_time = icaldurationtype_as_timet (*dur); if (dur->is_neg) - *alarm_start = MIN (*alarm_start, end - dur_time); - else *alarm_end = MAX (*alarm_end, end + dur_time); + else + *alarm_start = MIN (*alarm_start, start - dur_time); break; |