aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/mail-account-gui.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6b9e583940..c6c7159095 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-04 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-account-gui.c (mail_account_gui_save): Added some more NULL checks.
+
2001-10-04 <NotZed@Ximian.com>
* component-factory.c (storage_remove_folder): Do the url
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index d9a0da12c5..30a7ec1ea5 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -1649,7 +1649,7 @@ mail_account_gui_save (MailAccountGui *gui)
save_service (&gui->transport, NULL, account->transport);
/* Check to make sure that the Drafts folder uri is "valid" before assigning it */
- url = source_url ? camel_url_new (gui->drafts_folder.uri, NULL) : NULL;
+ url = source_url && gui->drafts_folder.uri ? camel_url_new (gui->drafts_folder.uri, NULL) : NULL;
if (mail_config_get_account_by_source_url (gui->drafts_folder.uri) ||
(url && provider->url_equal (source_url, url))) {
g_free (account->drafts_folder_name);
@@ -1668,7 +1668,7 @@ mail_account_gui_save (MailAccountGui *gui)
camel_url_free (url);
/* Check to make sure that the Sent folder uri is "valid" before assigning it */
- url = camel_url_new (gui->drafts_folder.uri, NULL);
+ url = source_url && gui->sent_folder.uri ? camel_url_new (gui->sent_folder.uri, NULL) : NULL;
if (mail_config_get_account_by_source_url (gui->sent_folder.uri) ||
(url && provider->url_equal (source_url, url))) {
g_free (account->sent_folder_name);