diff options
| author | Milan Crha <mcrha@redhat.com> | 2008-12-11 02:05:37 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2008-12-11 02:05:37 +0800 |
| commit | 06a037544e7228f10f5e8f9f73534e4c3c407f64 (patch) | |
| tree | 335104942f34a0b4d5f8245f88bc4ee9b00e42bd | |
| parent | 6282a9f702c56ac11e795133e1d12c1e2b4c9ada (diff) | |
| download | gsoc2013-evolution-06a037544e7228f10f5e8f9f73534e4c3c407f64.tar gsoc2013-evolution-06a037544e7228f10f5e8f9f73534e4c3c407f64.tar.gz gsoc2013-evolution-06a037544e7228f10f5e8f9f73534e4c3c407f64.tar.bz2 gsoc2013-evolution-06a037544e7228f10f5e8f9f73534e4c3c407f64.tar.lz gsoc2013-evolution-06a037544e7228f10f5e8f9f73534e4c3c407f64.tar.xz gsoc2013-evolution-06a037544e7228f10f5e8f9f73534e4c3c407f64.tar.zst gsoc2013-evolution-06a037544e7228f10f5e8f9f73534e4c3c407f64.zip | |
** Part of fix for bug #552583
2008-12-10 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=/branches/gnome-2-24/; revision=36866
| -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 ffbf9a0a75..559e67e44d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2008-12-10 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 diff --git a/mail/mail-config.c b/mail/mail-config.c index 0d3db2f0d4..3f42aff6b9 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -824,8 +824,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 */ @@ -865,8 +867,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 */ |