aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shell-startup-wizard.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index c8685b82c0..beb7c5b744 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-21 Iain Holmes <iain@ximian.com>
+
+ * e-shell-startup-wizard.c (make_mail_dialog_pages): Show an error
+ window if mailer doesn't respond.
+
2001-08-21 Ettore Perazzoli <ettore@ximian.com>
* e-shell-folder-title-bar.c (label_realize_callback): Fix a leak:
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index ab10f921cf..2c36a1eafc 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.c
@@ -124,6 +124,8 @@ make_mail_dialog_pages (SWData *data)
CORBA_exception_init (&ev);
data->mailer = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Mail_Wizard", 0, NULL, &ev);
if (BONOBO_EX (&ev)) {
+ e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
+ _("Could not start the Evolution Mailer Wizard interface\n%s"), CORBA_exception_id (&ev));
g_warning ("Could not start mailer (%s)", CORBA_exception_id (&ev));
CORBA_exception_free (&ev);
return;
@@ -131,7 +133,8 @@ make_mail_dialog_pages (SWData *data)
CORBA_exception_free (&ev);
if (data->mailer == CORBA_OBJECT_NIL) {
- g_warning ("Could not activate mailer.");
+ e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
+ _("Cannot initialize the Evolution Mailer Wizard interface"));
return;
}