* src/maemo/modest-msg-edit-window.c:

[modest] / src / maemo / easysetup / modest-presets.c

diff --git a/src/maemo/easysetup/modest-presets.c b/src/maemo/easysetup/modest-presets.c
index 0a6df35..d3c5553 100644 (file)
--- a/src/maemo/easysetup/modest-presets.c
+++ b/src/maemo/easysetup/modest-presets.c
@@ -29,6 +29,7 @@
 
 #include <string.h> /* for strcmp */
 #include "modest-presets.h"
+#include <stdio.h>
 
 /* Include config.h so that _() works: */
 #ifdef HAVE_CONFIG_H
@@ -43,7 +44,7 @@
 #define MODEST_PRESETS_KEY_OUTGOING            "OutgoingMailServer"
 #define MODEST_PRESETS_KEY_MAILBOX_TYPE        "MailboxType"
 #define MODEST_PRESETS_KEY_APOP                "APOPSecureLogin"
-#define MODEST_PRESETS_KEY_SECURE_SMTP         "SecureSMTP"
+#define MODEST_PRESETS_KEY_SECURE_SMTP         "SecureSmtp"
                                                    
 
 ModestPresets*
@@ -115,10 +116,12 @@ modest_presets_get_providers  (ModestPresets *self, guint mcc,
        };
                
        /* return *all* providers? */
+       /*
        if (mcc == 0 && include_globals) {
                *provider_ids = all_provider_ids;
                return all_providers;
        }
+       */
        
        /* nope: filter them */
 
@@ -265,10 +268,10 @@ modest_presets_get_info_server_security (ModestPresets *self, const gchar *provi
                                             MODEST_PRESETS_KEY_OUTGOING, NULL);
                if (val) {
                        g_free (val);
-                       info |= MODEST_PRESETS_SECURITY_SECURE_SMTP;
                        
                        val = g_key_file_get_string (self->keyfile, provider_id,
                                                     MODEST_PRESETS_KEY_SECURE_SMTP, NULL);
+                       /* printf("debug: %s: provider_id=%s, secure-smtp val=%s\n", __FUNCTION__, provider_id, val); */
                        if (val && strcmp(val,"true") == 0)
                                info |= MODEST_PRESETS_SECURITY_SECURE_SMTP;
                        g_free(val);