From: Sergio Villar Senin <svillar@igalia.com>
Date: Wed, 18 Mar 2009 17:15:08 +0000 (+0000)
Subject: Fixes FwNULL 14/16
X-Git-Tag: git_migration_finished~258
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=d1db55141f6b645c376ddda0c9f3aef773708670

Fixes FwNULL 14/16

pmo-trunk-r8178
---

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index 1d96d52..9b46b4b 100644
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -738,15 +738,13 @@ void
 modest_account_mgr_save_account_settings (ModestAccountMgr *mgr,
 					  ModestAccountSettings *settings)
 {
-	g_return_if_fail (MODEST_IS_ACCOUNT_MGR (mgr));
-	g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS (settings));
-
 	const gchar *account_name;
-	const gchar *store_account_name;
-	const gchar *transport_account_name;
 	ModestServerAccountSettings *store_settings;
 	ModestServerAccountSettings *transport_settings;
 
+	g_return_if_fail (MODEST_IS_ACCOUNT_MGR (mgr));
+	g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS (settings));
+
 	account_name = modest_account_settings_get_account_name (settings);
 	g_return_if_fail (account_name != NULL);
 
@@ -770,15 +768,19 @@ modest_account_mgr_save_account_settings (ModestAccountMgr *mgr,
 		 modest_account_settings_get_use_connection_specific_smtp (settings));
 
 	store_settings = modest_account_settings_get_store_settings (settings);
-	store_account_name = modest_server_account_settings_get_account_name (store_settings);
-	if (store_settings != NULL) {
+	if (store_settings) {
+		const gchar *store_account_name;
+		store_account_name = modest_server_account_settings_get_account_name (store_settings);
+		if (store_account_name)
+			modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_STORE_ACCOUNT, 
+						       store_account_name, FALSE);
 		modest_account_mgr_save_server_settings (mgr, store_settings);
+		g_object_unref (store_settings);
 	}
-	modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_STORE_ACCOUNT, store_account_name, FALSE);
-	g_object_unref (store_settings);
 
 	transport_settings = modest_account_settings_get_transport_settings (settings);
 	if (transport_settings) {
+		const gchar *transport_account_name;
 		transport_account_name = modest_server_account_settings_get_account_name (transport_settings);
 		if (transport_account_name)
 			modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT,