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-notify.c | |
| parent | 3e517a00308004b021cb5a02fa8ae17dfc30040f (diff) | |
| download | gsoc2013-evolution-ee208ba079ed4d8e7073d1728cc24e2d5b7babcf.tar gsoc2013-evolution-ee208ba079ed4d8e7073d1728cc24e2d5b7babcf.tar.gz gsoc2013-evolution-ee208ba079ed4d8e7073d1728cc24e2d5b7babcf.tar.bz2 gsoc2013-evolution-ee208ba079ed4d8e7073d1728cc24e2d5b7babcf.tar.lz gsoc2013-evolution-ee208ba079ed4d8e7073d1728cc24e2d5b7babcf.tar.xz 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-notify.c')
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-notify.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index 61b8e8ecc5..f4e493f31e 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -197,7 +197,12 @@ add_uri_to_load (GnomeVFSURI *uri) g_assert (str_uri != NULL); loaded_uris = get_calendars_to_load (); - g_assert (loaded_uris != NULL); + if (!loaded_uris) { + g_message ("add_uri_to_load(): Could not get the list of calendars to load; " + "will not add `%s'", str_uri); + g_free (str_uri); + return; + } /* Look for the URI in the list of calendars to load */ @@ -232,7 +237,12 @@ remove_uri_to_load (GnomeVFSURI *uri) g_assert (str_uri != NULL); loaded_uris = get_calendars_to_load (); - g_assert (loaded_uris != NULL); + if (!loaded_uris) { + g_message ("remove_uri_to_load(): Could not get the list of calendars to load; " + "will not add `%s'", str_uri); + g_free (str_uri); + return; + } /* Look for the URI in the list of calendars to load */ |