aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-composer-prefs.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d7ad00e5d2..e6ffb0c42c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-18 Radek Doulik <rodo@ximian.com>
+
+ * mail-composer-prefs.c (spell_setup_check_options): check
+ exception state and take care when exception raised
+
2002-11-18 Jeffrey Stedfast <fejj@ximian.com>
* mail-accounts.c (mail_accounts_load): Specify the default
diff --git a/mail/mail-composer-prefs.c b/mail/mail-composer-prefs.c
index d68277e92a..ba65f31a54 100644
--- a/mail/mail-composer-prefs.c
+++ b/mail/mail-composer-prefs.c
@@ -746,8 +746,13 @@ spell_setup_check_options (MailComposerPrefs *prefs)
CORBA_exception_init (&ev);
prefs->language_seq = GNOME_Spell_Dictionary_getLanguages (dict, &ev);
+ if (ev._major != CORBA_NO_EXCEPTION)
+ prefs->language_seq = NULL;
CORBA_exception_free (&ev);
+ if (prefs->language_seq == NULL)
+ return FALSE;
+
gconf_client_add_dir (prefs->gconf, GNOME_SPELL_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
spell_setup (prefs);