aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2001-03-31 11:32:48 +0800
committerIain Holmes <iain@src.gnome.org>2001-03-31 11:32:48 +0800
commit60d5bd3fc9197b9def0415d9e45e57a62814c4f5 (patch)
tree8175dd356d8367474b86958e3b346ba1a9e12a4c
parent2960cad1a7015eb13de39503081249b63f165962 (diff)
downloadgsoc2013-evolution-60d5bd3fc9197b9def0415d9e45e57a62814c4f5.tar.gz
gsoc2013-evolution-60d5bd3fc9197b9def0415d9e45e57a62814c4f5.tar.zst
gsoc2013-evolution-60d5bd3fc9197b9def0415d9e45e57a62814c4f5.zip
If the importer can't be started, don't continue
svn path=/trunk/; revision=9064
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/importer/importer.c12
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 */