Murray Cumming <murrayc@murrayc.com>

pmo-trunk-r2157

diff --git a/ChangeLog2 b/ChangeLog2
index be20c1c..d98cb0e 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,14 @@
 2007-06-11  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/maemo/easysetup/modest-presets.c:
+       (modest_presets_get_info_server_security): Correct the key name for 
+       SecureSmtp, because it seems to be case-sensitive.
+       * src/maemo/easysetup/modest-wizard-dialog.c: (create_title):
+       Do not try to get the 0th notebook page if there are 0 pages, to 
+       avoid a g_warning().
+
+2007-06-11  Murray Cumming  <murrayc@murrayc.com>
+
        * src/maemo/modest-platform.c: (modest_platform_on_new_msg):
        Prevent use of the new notification feature for now, because it currently 
        shows one dialog for each new email, which is annoying.

diff --git a/src/maemo/easysetup/modest-easysetup-country-combo-box.c b/src/maemo/easysetup/modest-easysetup-country-combo-box.c
index 21c36d3..1db0ef4 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-country-combo-box.c
+++ b/src/maemo/easysetup/modest-easysetup-country-combo-box.c
@@ -197,7 +197,7 @@ static void load_from_file (EasysetupCountryComboBox *self)
        /* this is the official version, in the 'operator-wizard-settings' package */
        const gchar* filepath = "/usr/share/operator-wizard/mcc_mapping";
 #endif /*MODEST_HILDON_VERSION_0*/
-       printf ("DEBUG: %s: filepath=%s\n", __FUNCTION__, filepath);
+       /* printf ("DEBUG: %s: filepath=%s\n", __FUNCTION__, filepath); */
        FILE *file = fopen(filepath, "r");
        if (!file)
        {

diff --git a/src/maemo/easysetup/modest-presets.c b/src/maemo/easysetup/modest-presets.c
index 69cd691..7511dd1 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*
@@ -271,6 +272,7 @@ modest_presets_get_info_server_security (ModestPresets *self, const gchar *provi
                        
                        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);

diff --git a/src/maemo/easysetup/modest-wizard-dialog.c b/src/maemo/easysetup/modest-wizard-dialog.c
index 0f71694..8af9e34 100644 (file)
--- a/src/maemo/easysetup/modest-wizard-dialog.c
+++ b/src/maemo/easysetup/modest-wizard-dialog.c
@@ -455,9 +455,9 @@ create_title (ModestWizardDialog *wizard_dialog)
         return;
 
     /* Get page information, we'll need that when creating title */
-    /*
     gint pages = gtk_notebook_get_n_pages (notebook);
-       */
+    if (pages == 0)
+      return;
        
     gint current = gtk_notebook_get_current_page (priv->notebook);
     if (current < 0)