evolution r36840 - branches/gnome-2-24/mail

[psankar svn gnome org]

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

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

	** Fixes bug #552583

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




Modified:
   branches/gnome-2-24/mail/ChangeLog
   branches/gnome-2-24/mail/mail-config.c

Modified: branches/gnome-2-24/mail/mail-config.c
==============================================================================
--- branches/gnome-2-24/mail/mail-config.c	(original)
+++ branches/gnome-2-24/mail/mail-config.c	Mon Dec  8 05:56:00 2008
@@ -817,14 +817,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)
@@ -861,14 +858,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)