diff options
| author | Federico Mena Quintero <federico@ximian.com> | 2001-10-20 01:59:20 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2001-10-20 01:59:20 +0800 |
| commit | ee208ba079ed4d8e7073d1728cc24e2d5b7babcf (patch) | |
| tree | 58335147dc935e87364da5e8476c9da834346ebf /calendar/gui/alarm-notify/alarm-queue.c | |
| parent | 3e517a00308004b021cb5a02fa8ae17dfc30040f (diff) | |
| download | gsoc2013-evolution-ee208ba079ed4d8e7073d1728cc24e2d5b7babcf.tar.gz gsoc2013-evolution-ee208ba079ed4d8e7073d1728cc24e2d5b7babcf.tar.zst gsoc2013-evolution-ee208ba079ed4d8e7073d1728cc24e2d5b7babcf.zip | |
Do not assert if we fail to load the URI list. This would of course have
2001-10-19 Federico Mena Quintero <federico@ximian.com>
* gui/alarm-notify/alarm-notify.c (add_uri_to_load): Do not assert
if we fail to load the URI list. This would of course have been a
bonobo-conf activation problem.
(remove_uri_to_load): Likewise.
* gui/alarm-notify/notify-main.c (load_calendars): Likewise.
* gui/alarm-notify/alarm-queue.c (load_missed_alarms): Make the
time range half-open so that we do not display the last alarm
twice.
svn path=/trunk/; revision=13797
Diffstat (limited to 'calendar/gui/alarm-notify/alarm-queue.c')
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-queue.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index b0a6aa8dda..0a57e78ad7 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -383,7 +383,12 @@ load_missed_alarms (ClientAlarms *ca) now = time (NULL); g_assert (saved_notification_time != -1); - load_alarms (ca, saved_notification_time, now); + + /* We add 1 to the saved_notification_time to make the time ranges + * half-open; we do not want to display the "last" displayed alarm + * twice, once when it occurs and once when the alarm daemon restarts. + */ + load_alarms (ca, saved_notification_time + 1, now); } /* Called when a calendar client finished loading; we load its alarms */ |