evolution r36859 - trunk/mail

[mcrha svn gnome org]

Author: mcrha
Date: Tue Dec  9 19:12:33 2008
New Revision: 36859
URL: http://svn.gnome.org/viewvc/evolution?rev=36859&view=rev

Log:
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.



Modified:
   trunk/mail/ChangeLog
   trunk/mail/mail-config.c

Modified: trunk/mail/mail-config.c
==============================================================================
--- trunk/mail/mail-config.c	(original)
+++ trunk/mail/mail-config.c	Tue Dec  9 19:12:33 2008
@@ -846,8 +846,10 @@
 		}
 
 		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 @@
 		}
 
 		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 */