aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/importers/icalendar-importer.c5
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,