X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-settings-dialog.c;h=7d28d4f8ca0dce26bb89d3773fe9fc674e18b8a3;hb=71d0d1844cae21a33bc5c6528fba2b844fb7b3ec;hp=444b1348ec0a35fcdf20a318a33f98e77a2f9695;hpb=69014ca6c2411ed39ea44796fc13dfbe891f5ff0;p=modest

diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c
index 444b134..7d28d4f 100644
--- a/src/maemo/modest-account-settings-dialog.c
+++ b/src/maemo/modest-account-settings-dialog.c
@@ -1110,7 +1110,7 @@ on_response (GtkDialog *wizard_dialog,
 
 
 					store_settings = modest_account_settings_get_store_settings (self->settings);
-					transport_settings = modest_account_settings_get_store_settings (self->settings);
+					transport_settings = modest_account_settings_get_transport_settings (self->settings);
 					store_account_name = modest_server_account_settings_get_account_name (store_settings);
 					transport_account_name = modest_server_account_settings_get_account_name (transport_settings);
 					
@@ -1572,10 +1572,10 @@ enable_buttons (ModestAccountSettingsDialog *self)
 	
 	/* The account details title is mandatory: */
 	if (entry_is_empty(self->entry_account_title))
-			enable_ok = FALSE;
+		enable_ok = FALSE;
 
 	/* The user details username is mandatory: */
-	if (entry_is_empty(self->entry_user_username))
+	if (enable_ok && entry_is_empty(self->entry_user_username))
 		enable_ok = FALSE;
 		
 	/* The user details email address is mandatory: */
@@ -1583,7 +1583,11 @@ enable_buttons (ModestAccountSettingsDialog *self)
 		enable_ok = FALSE;
 
 	/* The custom incoming server is mandatory: */
-	if (entry_is_empty(self->entry_incomingserver))
+	if (enable_ok && entry_is_empty(self->entry_incomingserver))
+		enable_ok = FALSE;
+
+	/* The custom incoming server is mandatory: */
+	if (enable_ok && entry_is_empty(self->entry_outgoingserver))
 		enable_ok = FALSE;
 
 	/* Outgoing username is mandatory if outgoing auth is secure */