[evolution] Bug 648756 - Custom imap port forgotten

[Matthew Barnes <mbarnes src gnome org>]

commit 0ea909d4e23719823ae30f4d09d7cfc44e29b5ce
Author: Dan Vrátil <dvratil redhat com>
Date:   Thu Apr 28 17:01:56 2011 -0400

    Bug 648756 - Custom imap port forgotten

 mail/em-account-editor.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index f51f5ed..a0083ec 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2101,10 +2101,6 @@ emae_setup_service (EMAccountEditor *emae, EMAccountEditorService *service, GtkB
 		gtk_entry_set_text (service->username, url->user);
 	}
 
-	if (url->port && service->provider->port_entries) {
-		e_port_entry_set_port (service->port, url->port);
-	}
-
 	if (service->pathentry) {
 		GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
 
@@ -2129,6 +2125,12 @@ emae_setup_service (EMAccountEditor *emae, EMAccountEditorService *service, GtkB
 		}
 	}
 
+	/* Set the port after SSL is set, because it would overwrite the
+	   port value (through emae_ssl_changed signal) */
+	if (url->port && service->provider->port_entries) {
+		e_port_entry_set_port (service->port, url->port);
+	}
+
 	/* old authtype will be destroyed when we exit */
 	emae_refresh_providers (emae, service);
 	emae_refresh_authtype (emae, service);