From afea64785f1fbcb9852fa520f67f3a60f303c372 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 2 Jul 2009 19:31:49 +0200 Subject: Bug #252296 - Do not preset alarm for all day events --- calendar/gui/comp-util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'calendar/gui/comp-util.c') diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index 62a55d2c30..cb3cf95def 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -278,12 +278,12 @@ is_icalcomp_on_the_server (icalcomponent *icalcomp, ECal *client) * cal_comp_event_new_with_defaults: * * Creates a new VEVENT component and adds any default alarms to it as set in - * the program's configuration values. + * the program's configuration values, but only if not the all_day event. * * Return value: A newly-created calendar component. **/ ECalComponent * -cal_comp_event_new_with_defaults (ECal *client) +cal_comp_event_new_with_defaults (ECal *client, gboolean all_day) { icalcomponent *icalcomp; ECalComponent *comp; @@ -303,7 +303,7 @@ cal_comp_event_new_with_defaults (ECal *client) e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_EVENT); } - if (!calendar_config_get_use_default_reminder ()) + if (all_day || !calendar_config_get_use_default_reminder ()) return comp; interval = calendar_config_get_default_reminder_interval (); @@ -361,7 +361,7 @@ cal_comp_event_new_with_current_time (ECal *client, gboolean all_day) ECalComponentDateTime dt; icaltimezone *zone; - comp = cal_comp_event_new_with_defaults (client); + comp = cal_comp_event_new_with_defaults (client, all_day); g_return_val_if_fail (comp, NULL); -- cgit v1.2.3