diff options
| author | Milan Crha <mcrha@redhat.com> | 2008-12-10 03:12:33 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2008-12-10 03:12:33 +0800 |
| commit | e21153cdc86e029a16501cb8686f99f93a15555f (patch) | |
| tree | 66422fef7c8aa62d1ae995760f68a7c2225e0880 | |
| parent | 4d269fdc404863e16f62de4f301d7aca29f69f06 (diff) | |
| download | gsoc2013-evolution-e21153cdc86e029a16501cb8686f99f93a15555f.tar.gz gsoc2013-evolution-e21153cdc86e029a16501cb8686f99f93a15555f.tar.zst gsoc2013-evolution-e21153cdc86e029a16501cb8686f99f93a15555f.zip | |
** Part of fix for bug #552583
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.
svn path=/trunk/; revision=36859
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/mail-config.c | 8 |
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 */ |