diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-01 22:47:10 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-01 22:47:10 +0800 |
commit | 1351c8e4fb443a9705bb1225c3c574c05a36f8ca (patch) | |
tree | e049bafefac361ae66dfa43abdb956f1f3a730e0 /mail/em-account-editor.c | |
parent | 624f48121f523101fe26c3d3a8b51a4eeda90990 (diff) | |
parent | 42e75c9162402078ac629740821c3533925ee342 (diff) | |
download | gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar.gz gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar.zst gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.zip |
Merge branch 'master' into kill-bonobo
Diffstat (limited to 'mail/em-account-editor.c')
-rw-r--r-- | mail/em-account-editor.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index e835d28a87..e25d0553cb 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -3047,9 +3047,11 @@ emae_check_complete (EConfig *ec, const gchar *pageid, gpointer data) const gchar *tmp; EAccount *ea; gboolean refresh = FALSE; + gboolean edit; account = em_account_editor_get_modified_account (emae); original_account = em_account_editor_get_modified_account (emae); + edit = (original_account != NULL); /* We use the page-check of various pages to 'prepare' or pre-load their values, only in the druid */ @@ -3088,7 +3090,7 @@ emae_check_complete (EConfig *ec, const gchar *pageid, gpointer data) index = check_servers (at); gtk_entry_set_text (emae->priv->source.username, user); gtk_entry_set_text (emae->priv->transport.username, user); - if (uri && (url = camel_url_new (uri, NULL)) != NULL) { + if (!edit && uri && (url = camel_url_new (uri, NULL)) != NULL) { refresh = TRUE; camel_url_set_protocol (url, mail_servers[index].proto); camel_url_set_param (url, "use_ssl", mail_servers[index].ssl); |