aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/dialogs
diff options
context:
space:
mode:
authorSuman Manjunath <msuman@src.gnome.org>2008-12-08 12:02:47 +0800
committerSuman Manjunath <msuman@src.gnome.org>2008-12-08 12:02:47 +0800
commit7223655df2828370ab19f14953ecd22a30a4b55f (patch)
tree316d1edfe4a3daa3288d5420d5ffc3d8a141d61d /calendar/gui/dialogs
parent7b221ebc07a7867c3528b113e82f25a01816a015 (diff)
downloadgsoc2013-evolution-7223655df2828370ab19f14953ecd22a30a4b55f.tar
gsoc2013-evolution-7223655df2828370ab19f14953ecd22a30a4b55f.tar.gz
gsoc2013-evolution-7223655df2828370ab19f14953ecd22a30a4b55f.tar.bz2
gsoc2013-evolution-7223655df2828370ab19f14953ecd22a30a4b55f.tar.lz
gsoc2013-evolution-7223655df2828370ab19f14953ecd22a30a4b55f.tar.xz
gsoc2013-evolution-7223655df2828370ab19f14953ecd22a30a4b55f.tar.zst
gsoc2013-evolution-7223655df2828370ab19f14953ecd22a30a4b55f.zip
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).
svn path=/trunk/; revision=36837
Diffstat (limited to 'calendar/gui/dialogs')
-rw-r--r--calendar/gui/dialogs/alarm-dialog.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index a5f13ccb51..7e429a28b2 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -623,19 +623,18 @@ populate_widgets_from_alarm (Dialog *dialog)
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 */