evolution r36839 - trunk/mail

[psankar svn gnome org]

Author: psankar
Date: Mon Dec  8 05:49:35 2008
New Revision: 36839
URL: http://svn.gnome.org/viewvc/evolution?rev=36839&view=rev

Log:
2008-12-08  Sankar P  <psankar novell com>

	** Fixes bug #552583

	* mail/mail-config.c: (mail_config_get_account_by_source_url)
	(mail_config_get_account_by_transport_url):
	Fix the errors in the account checking logic.

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	Mon Dec  8 05:49:35 2008
@@ -839,14 +839,11 @@
 
 		e_iterator_next (iter);
 
-		if (account->source == NULL)
-			continue;
-
-		else if (account->source->url == NULL)
-			continue;
-
-		else if (*account->source->url == '\0')
+		if ( !account || (account->source == NULL) || 
+			(account->source->url == NULL) || (*account->source->url == '\0')) {
+			account = NULL;
 			continue;
+		}
 
 		account_url = camel_url_new (account->source->url, NULL);
 		if (account_url == NULL)
@@ -883,14 +880,11 @@
 
 		e_iterator_next (iter);
 
-		if (account->transport == NULL)
-			continue;
-
-		else if (account->transport->url == NULL)
-			continue;
-
-		else if (*account->transport->url == '\0')
-			continue;
+		if ( !account || (account->transport == NULL) || 
+			(account->transport->url == NULL) || (*account->transport->url == '\0')) {
+				account = NULL;
+				continue;
+		}
 
 		account_url = camel_url_new (account->transport->url, NULL);
 		if (account_url == NULL)