diff options
| -rw-r--r-- | calendar/ChangeLog | 5 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-queue.c | 1 | ||||
| -rw-r--r-- | calendar/importers/icalendar-importer.c | 6 |
3 files changed, 10 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index cf526ca79c..016276784d 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2002-07-18 Rodrigo Moya <rodrigo@ximian.com> + + * importers/icalendar-importer.c (get_uri_from_folder_path): if + there's an exception, continue with the next item. + 2002-07-08 Peter Williams <peterw@ximian.com> * cal-util/Makefile.am: Install libcal-util-static.la diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index fd22649e71..382d733881 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -35,7 +35,6 @@ #include <libgnome/gnome-sound.h> #include <libgnomeui/gnome-dialog.h> #include <libgnomeui/gnome-dialog-util.h> -#include <libgnomeui/gnome-dialog.h> #include <libgnomeui/gnome-stock.h> #include <libgnomeui/gnome-uidefs.h> #include <cal-util/timeutil.h> diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 766202de2b..3260ed8fcc 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -176,8 +176,12 @@ get_uri_from_folder_path (ICalImporter *ici, const char *folderpath) CORBA_exception_init (&ev); corba_folder = GNOME_Evolution_Storage_getFolderAtPath (storage_list->_buffer[i], folderpath, &ev); - if (BONOBO_EX (&ev)) + if (BONOBO_EX (&ev)) { g_warning (_("Can't call getFolderAtPath on storage: %s"), CORBA_exception_id (&ev)); + CORBA_exception_free (&ev); + continue; + } + CORBA_exception_free (&ev); if (corba_folder) { |