diff options
| author | Suman Manjunath <msuman@src.gnome.org> | 2008-12-08 12:10:27 +0800 |
|---|---|---|
| committer | Suman Manjunath <msuman@src.gnome.org> | 2008-12-08 12:10:27 +0800 |
| commit | 60a043e1a8da877cd60100c8ece4cc0bf3be1508 (patch) | |
| tree | f07dc2ff6c37c9f685bc5f2fecd6942819a39a56 | |
| parent | 7cc316aa15562a2893a8ca2bf5cd8f7ab1689aa3 (diff) | |
| download | gsoc2013-evolution-60a043e1a8da877cd60100c8ece4cc0bf3be1508.tar gsoc2013-evolution-60a043e1a8da877cd60100c8ece4cc0bf3be1508.tar.gz gsoc2013-evolution-60a043e1a8da877cd60100c8ece4cc0bf3be1508.tar.bz2 gsoc2013-evolution-60a043e1a8da877cd60100c8ece4cc0bf3be1508.tar.lz gsoc2013-evolution-60a043e1a8da877cd60100c8ece4cc0bf3be1508.tar.xz gsoc2013-evolution-60a043e1a8da877cd60100c8ece4cc0bf3be1508.tar.zst gsoc2013-evolution-60a043e1a8da877cd60100c8ece4cc0bf3be1508.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=/branches/gnome-2-24/; revision=36838
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/dialogs/alarm-dialog.c | 17 |
2 files changed, 16 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 6ffe1d4189..48e351a1c9 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2008-12-08 Paul Bolle <pebolle@tiscali.nl> + + ** Fix for bug #551599 + + * gui/dialogs/alarm-dialog.c: (populate_widgets_from_alarm): + Do not fallback to default 15 minutes alarm offset if alarm is + triggered at start (or end) of appointment. + 2008-11-25 Milan Crha <mcrha@redhat.com> ** Fix for bug #560138 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 */ |