evolution r36838 - in branches/gnome-2-24/calendar: . gui/dialogs

[msuman svn gnome org]

Author: msuman
Date: Mon Dec  8 04:10:27 2008
New Revision: 36838
URL: http://svn.gnome.org/viewvc/evolution?rev=36838&view=rev

Log:
Patch from Paul Bolle  <pebolle tiscali nl> : Fix for bug #551599 (Do not fallback to default 15 minutes alarm offset if alarm is triggered at start (or end) of appointment).

Modified:
   branches/gnome-2-24/calendar/ChangeLog
   branches/gnome-2-24/calendar/gui/dialogs/alarm-dialog.c

Modified: branches/gnome-2-24/calendar/gui/dialogs/alarm-dialog.c
==============================================================================
--- branches/gnome-2-24/calendar/gui/dialogs/alarm-dialog.c	(original)
+++ branches/gnome-2-24/calendar/gui/dialogs/alarm-dialog.c	Mon Dec  8 04:10:27 2008
@@ -623,19 +623,18 @@
 		break;
 	}
 
-	if ( trigger->u.rel_duration.hours ) {
+	if ( trigger->u.rel_duration.days ) {
+		e_dialog_option_menu_set (dialog->value_units, DAYS, value_map);
+		e_dialog_spin_set (dialog->interval_value, trigger->u.rel_duration.days);
+	} else if ( trigger->u.rel_duration.hours ) {
 		e_dialog_option_menu_set (dialog->value_units, HOURS, value_map);
 		e_dialog_spin_set (dialog->interval_value, trigger->u.rel_duration.hours);
-	}
-
-	if ( trigger->u.rel_duration.minutes ){
+	} else if ( trigger->u.rel_duration.minutes ) {
 		e_dialog_option_menu_set (dialog->value_units, MINUTES, value_map);
 		e_dialog_spin_set (dialog->interval_value, trigger->u.rel_duration.minutes);
-	}
-
-	if ( trigger->u.rel_duration.days ){
-		e_dialog_option_menu_set (dialog->value_units, DAYS, value_map);
-		e_dialog_spin_set (dialog->interval_value, trigger->u.rel_duration.days);
+	} else {
+		e_dialog_option_menu_set (dialog->value_units, MINUTES, value_map);
+		e_dialog_spin_set (dialog->interval_value, 0);
 	}
 
 	/* Repeat options */