diff options
| author | Rodrigo Moya <rodrigo@ximian.com> | 2002-10-01 18:14:40 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@src.gnome.org> | 2002-10-01 18:14:40 +0800 |
| commit | f658fb78a26001c964f1b86a18c62e7c97468348 (patch) | |
| tree | 4657ec5a87ae57b197d0185a0bd03858a32fac14 /calendar | |
| parent | 0f43c2bfdc434237bdb57e5038986a6f56da30e4 (diff) | |
| download | gsoc2013-evolution-f658fb78a26001c964f1b86a18c62e7c97468348.tar gsoc2013-evolution-f658fb78a26001c964f1b86a18c62e7c97468348.tar.gz gsoc2013-evolution-f658fb78a26001c964f1b86a18c62e7c97468348.tar.bz2 gsoc2013-evolution-f658fb78a26001c964f1b86a18c62e7c97468348.tar.lz gsoc2013-evolution-f658fb78a26001c964f1b86a18c62e7c97468348.tar.xz gsoc2013-evolution-f658fb78a26001c964f1b86a18c62e7c97468348.tar.zst gsoc2013-evolution-f658fb78a26001c964f1b86a18c62e7c97468348.zip | |
Fixes #30290
2002-10-01 Rodrigo Moya <rodrigo@ximian.com>
Fixes #30290
* importers/icalendar-importer.c (process_item_fn): return a status of
BUSY rather than NOT_READY, to avoid the display of the error message.
svn path=/trunk/; revision=18276
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/importers/icalendar-importer.c | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index b7326da9b6..a498b65992 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2002-10-01 Rodrigo Moya <rodrigo@ximian.com> + + Fixes #30290 + + * importers/icalendar-importer.c (process_item_fn): return a status of + BUSY rather than NOT_READY, to avoid the display of the error message. + 2002-09-30 JP Rosevear <jpr@ximian.com> * conduits/calendar/calendar-conduit.c diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index b61da37862..f887637e53 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -302,11 +302,10 @@ process_item_fn (EvolutionImporter *importer, || tasks_state == CAL_CLIENT_LOAD_LOADING) { GNOME_Evolution_ImporterListener_notifyResult ( listener, - GNOME_Evolution_ImporterListener_NOT_READY, + GNOME_Evolution_ImporterListener_BUSY, TRUE, ev); return; - } - else if (state != CAL_CLIENT_LOAD_LOADED + } else if (state != CAL_CLIENT_LOAD_LOADED || tasks_state != CAL_CLIENT_LOAD_LOADED) { GNOME_Evolution_ImporterListener_notifyResult ( listener, |