aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-10-26 02:31:57 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-10-26 02:31:57 +0800
commit3644ccebcc338063efd88469908be8e41d3df7ce (patch)
tree7e40e6658347140275da867f8f6a1a0e2e1586b3
parent06a35575071afe841195199754a27f04a4b03716 (diff)
downloadgsoc2013-evolution-3644ccebcc338063efd88469908be8e41d3df7ce.tar.gz
gsoc2013-evolution-3644ccebcc338063efd88469908be8e41d3df7ce.tar.zst
gsoc2013-evolution-3644ccebcc338063efd88469908be8e41d3df7ce.zip
Set the ->mailer to be CORBA_OBJECT_NIL in case of an exception, otherwise
* e-shell-startup-wizard.c (make_mail_dialog_pages): Set the ->mailer to be CORBA_OBJECT_NIL in case of an exception, otherwise the caller will not realize about the problem. svn path=/trunk/; revision=14095
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-shell-startup-wizard.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 8c9a795e14..be2843caf7 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,11 @@
2001-10-25 Ettore Perazzoli <ettore@ximian.com>
+ * e-shell-startup-wizard.c (make_mail_dialog_pages): Set the
+ ->mailer to be CORBA_OBJECT_NIL in case of an exception, otherwise
+ the caller will not realize about the problem.
+
+2001-10-25 Ettore Perazzoli <ettore@ximian.com>
+
* evolution-wizard.c (evolution_wizard_set_buttons_sensitive):
Don't use __FUNCTION__.
(evolution_wizard_set_show_finish): Likewise.
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index 067f8e90c9..8e4e1c90e7 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.c
@@ -160,6 +160,7 @@ make_mail_dialog_pages (SWData *data)
_("Could not start the Evolution Mailer Assistant interface\n(%s)"), CORBA_exception_id (&ev));
g_warning ("Could not start mailer (%s)", CORBA_exception_id (&ev));
CORBA_exception_free (&ev);
+ data->mailer = CORBA_OBJECT_NIL;
return;
}