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

Fixes FwNULL 13/16

pmo-trunk-r8177
---

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index bbf8f9d..1d96d52 100644
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -778,12 +778,14 @@ modest_account_mgr_save_account_settings (ModestAccountMgr *mgr,
 	g_object_unref (store_settings);
 
 	transport_settings = modest_account_settings_get_transport_settings (settings);
-	transport_account_name = modest_server_account_settings_get_account_name (transport_settings);
-	if (transport_settings != NULL) {
+	if (transport_settings) {
+		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, 
+						       transport_account_name, FALSE);
 		modest_account_mgr_save_server_settings (mgr, transport_settings);
+		g_object_unref (transport_settings);
 	}
-	modest_account_mgr_set_string (mgr, account_name, MODEST_ACCOUNT_TRANSPORT_ACCOUNT, transport_account_name, FALSE);
-	g_object_unref (transport_settings);
 	modest_account_mgr_set_enabled (mgr, account_name, TRUE);
 }