aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorDan Vrátil <dvratil@redhat.com>2011-04-29 05:01:56 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:42:03 +0800
commit2ee2714ca3fde9c5caf9b7fa68ae6412acfa624b (patch)
treea3e94877fee367fb34c30c021c6ccaa34e8324e8 /mail
parent6bff39e1d6023e07f160824ada520e1a9b2f1006 (diff)
downloadgsoc2013-evolution-2ee2714ca3fde9c5caf9b7fa68ae6412acfa624b.tar.gz
gsoc2013-evolution-2ee2714ca3fde9c5caf9b7fa68ae6412acfa624b.tar.zst
gsoc2013-evolution-2ee2714ca3fde9c5caf9b7fa68ae6412acfa624b.zip
Bug 648756 - Custom imap port forgotten
Diffstat (limited to 'mail')
-rw-r--r--mail/em-account-editor.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index f51f5edcae..a0083ecee4 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);