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 e81aa98..79247e0 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -720,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);
 }
 
 
@@ -730,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) {