diff options
| -rw-r--r-- | shell/ChangeLog | 5 | ||||
| -rw-r--r-- | shell/importer/importer.c | 12 |
2 files changed, 17 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index af5263c2d2..87f7cbfe67 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2001-03-30 Iain Holmes <iain@ximian.com> + + * importer/importer.c (start_import): If the importer can't be started, then + don't continue. + 2001-03-29 Iain Holmes <iain@ximian.com> * importer/evolution-importer-client.c (evolution_importer_client_load_file): diff --git a/shell/importer/importer.c b/shell/importer/importer.c index 824d95d388..20e11524af 100644 --- a/shell/importer/importer.c +++ b/shell/importer/importer.c @@ -361,6 +361,18 @@ start_import (const char *filename, gtk_main_iteration (); icd->client = evolution_importer_client_new_from_id (real_iid); + if (icd->client == NULL) { + label = g_strdup_printf (_("Error starting %s"), real_iid); + g_free (real_iid); + gtk_label_set_text (GTK_LABEL (icd->contents), label); + g_free (label); + while (gtk_events_pending ()) + gtk_main_iteration (); + + gtk_object_unref (GTK_OBJECT (icd->dialog)); + g_free (icd); + return; + } g_free (real_iid); /* NULL for folderpath means use Inbox */ |