From e77baa7b74d94d792b667e03f34f18ff3f22856a Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Wed, 11 Jul 2007 15:58:08 +0000 Subject: [PATCH] 2007-07-11 Murray Cumming * src/maemo/easysetup/modest-easysetup-wizard.c: (create_account): Ignore the wrong (for now) secure-smtp setting in the presets - just default to requiring secure authentication for SMTP, because that is most common. pmo-trunk-r2712 --- ChangeLog2 | 11 +++++++++-- src/maemo/easysetup/modest-easysetup-wizard.c | 6 ++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog2 b/ChangeLog2 index 7b252fb..6c4e141 100644 --- a/ChangeLog2 +++ b/ChangeLog2 @@ -1,3 +1,10 @@ +2007-07-11 Murray Cumming + + * src/maemo/easysetup/modest-easysetup-wizard.c: (create_account): + Ignore the wrong (for now) secure-smtp setting in the presets - + just default to requiring secure authentication for SMTP, because + that is most common. + 2007-07-11 Johannes Schmid * src/widgets/modest-folder-view.c: (filter_row) @@ -13,7 +20,7 @@ Guess folder type and hide Sent & Outbox if necessary. Fixed project.maemo.org NB#57328 -2007-07-11 Murray Cumming +2007-07-11 Murray Cumming * src/modest-ui-actions.h: * src/modest-ui-actions.c: @@ -29,7 +36,7 @@ if the deleted message was open in a window. This fixed projects.maemo.org bug NB#62862. -2007-07-11 Murray Cumming +2007-07-11 Murray Cumming * src/modest-main.c: (main): Only show the UI at the start if the showui command line option was given. For instance, diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c index 2161439..72d6fc9 100644 --- a/src/maemo/easysetup/modest-easysetup-wizard.c +++ b/src/maemo/easysetup/modest-easysetup-wizard.c @@ -1674,8 +1674,10 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) modest_presets_get_info_server_security (priv->presets, provider_id, FALSE /* incoming */); - /* TODO: There is no SMTP authentication enum for presets, - so we should probably check what the server supports. */ + /* TODO: The secure-smtp information in the presets data is currently wrong, + * so we choose a reasonable default. Remove this when the presets data is corrected: */ + security_outgoing = security_outgoing & MODEST_PRESETS_SECURITY_SECURE_SMTP; + protocol_security_outgoing = MODEST_PROTOCOL_CONNECTION_NORMAL; if (security_outgoing & MODEST_PRESETS_SECURITY_SECURE_SMTP) { /* printf("DEBUG: %s: using secure SMTP\n", __FUNCTION__); */ -- 1.7.9.5