When editing and sending an e-mail in failed state, use the original

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index 3bb5408..79247e0 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -551,7 +551,6 @@ init_debug_logging (void)
 static void
 init_i18n (void)
 {
-#ifdef MODEST_PLATFORM_MAEMO
        /* little trick make en_GB the fallback language, instead
         * of the logical IDs
         * we need the ugly ifdefs, because modest_platform_init is
@@ -568,7 +567,6 @@ init_i18n (void)
                g_free (language);
        }
        /* end of little trick */
-#endif /*MODEST_PLATFORM_MAEMO */
 
        bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -722,6 +720,9 @@ init_default_settings (ModestConf *conf)
 
        if (!modest_conf_key_exists (conf, MODEST_CONF_REPLY_TYPE, NULL))
                modest_conf_set_int (conf, MODEST_CONF_REPLY_TYPE, MODEST_TNY_MSG_REPLY_TYPE_QUOTE, NULL);
+
+       if (!modest_conf_key_exists (conf, MODEST_CONF_FETCH_HTML_EXTERNAL_IMAGES, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_FETCH_HTML_EXTERNAL_IMAGES, FALSE, NULL);
 }
 
 
@@ -732,7 +733,7 @@ init_default_settings (ModestConf *conf)
 static void
 init_device_name (ModestConf *conf)
 {
-       unsigned int len = 255; /* max len */
+       gsize len = 255; /* max len */
        gchar *devname = NULL;
        
        if (!g_file_get_contents("/etc/hostname", &devname, &len, NULL) || len < 2 || len > 254) {