Fixes NB#126375, default message size limit lowered to 100Kb

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index db9be25..1dc9f3c 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -36,6 +36,7 @@
 #include <modest-runtime-priv.h>
 #include <modest-init.h>
 #include <modest-defs.h>
+#include "modest-address-book.h"
 #include <modest-singletons.h>
 #include <widgets/modest-header-view.h>
 #include <widgets/modest-folder-view.h>
@@ -245,6 +246,9 @@ modest_init (int argc, char *argv[])
                return FALSE;
        }
 
+       /* Initialize addressbook */
+       modest_address_book_init ();
+
        reset = modest_runtime_get_debug_flags () & MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS;
        if (!init_header_columns(modest_runtime_get_conf(), reset)) {
                modest_init_uninit ();
@@ -598,11 +602,13 @@ init_debug_logging (void)
 static void
 init_i18n (void)
 {
-       const gchar *lc_messages = getenv ("LC_MESSAGES");
+       const gchar *lc_messages = setlocale (LC_MESSAGES, NULL);
 
        if (!lc_messages) {
                setenv ("LANGUAGE", "en_GB", 1);
                setenv ("LC_MESSAGES", "en_GB", 1);
+       } else {
+               setenv ("LC_MESSAGES", lc_messages, 1);
        }
 
        bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
@@ -754,7 +760,7 @@ init_default_settings (ModestConf *conf)
                modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_UPDATE_INTERVAL_15_MIN, NULL);
 
        if (!modest_conf_key_exists (conf, MODEST_CONF_MSG_SIZE_LIMIT, NULL))
-               modest_conf_set_int (conf, MODEST_CONF_MSG_SIZE_LIMIT, 1000, NULL);
+               modest_conf_set_int (conf, MODEST_CONF_MSG_SIZE_LIMIT, 100, NULL);
 
        if (!modest_conf_key_exists (conf, MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, NULL))
                modest_conf_set_bool (conf, MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, FALSE, NULL);