aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/mail-config.c8
2 files changed, 14 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index f83efc22e7..6856858007 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,13 @@
2008-12-09 Milan Crha <mcrha@redhat.com>
+ ** Part of fix for bug #552583
+
+ * mail-config.c: (mail_config_get_account_by_source_url),
+ (mail_config_get_account_by_transport_url): Extending Sankar's fix
+ of account checking logic a bit, to be more consistent.
+
+2008-12-09 Milan Crha <mcrha@redhat.com>
+
** Fix for bug #563369
* em-folder-properties.c: (emfp_dialog_got_folder_quota):
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 08dc799bbc..d9d7b44407 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -846,8 +846,10 @@ mail_config_get_account_by_source_url (const char *source_url)
}
account_url = camel_url_new (account->source->url, NULL);
- if (account_url == NULL)
+ if (account_url == NULL) {
+ account = NULL;
continue;
+ }
if (!mail_config_account_url_equal (url, account_url))
account = NULL; /* not a match */
@@ -887,8 +889,10 @@ mail_config_get_account_by_transport_url (const char *transport_url)
}
account_url = camel_url_new (account->transport->url, NULL);
- if (account_url == NULL)
+ if (account_url == NULL) {
+ account = NULL;
continue;
+ }
if (!mail_config_account_url_equal (url, account_url))
account = NULL; /* not a match */