* src/modest-account-mgr-helpers.c:

[modest] / src / modest-account-mgr-helpers.c

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index 671e4e2..33f88fe 100644 (file)
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -65,13 +65,13 @@ gboolean modest_account_mgr_set_signature (ModestAccountMgr *self, const gchar*
        return result;
 }
 
-gchar* modest_account_mgr_get_signature (ModestAccountMgr *self, const gchar* name, 
-       gboolean* use_signature)
+gchar* 
+modest_account_mgr_get_signature (ModestAccountMgr *self, 
+                                 const gchar* name, 
+                                 gboolean* use_signature)
 {
-       if (use_signature) {
-               *use_signature = 
-                       modest_account_mgr_get_bool (self, name, MODEST_ACCOUNT_USE_SIGNATURE, FALSE);
-       }
+       *use_signature = 
+               modest_account_mgr_get_bool (self, name, MODEST_ACCOUNT_USE_SIGNATURE, FALSE);
        
        return modest_account_mgr_get_string (self, name, MODEST_ACCOUNT_SIGNATURE, FALSE);
 }
@@ -525,6 +525,10 @@ modest_account_mgr_save_server_settings (ModestAccountMgr *self,
                                                                           protocol, TRUE));
        }
 
+       if (!has_errors) {
+         modest_account_mgr_set_server_account_username_has_succeeded (self, account_name, FALSE);
+       }
+
        return !has_errors;
 
 }