X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-init.c;h=71770653936327d756b20aeb730437d1a64958f3;hp=a4394df1f4f3d32555eb75f434a35e7ede609a2f;hb=16c1a13ce46a9befd8fbe3d0fd63ce80c1a5cd97;hpb=5328c70938871f867387386c2a7c88254033b160

diff --git a/src/modest-init.c b/src/modest-init.c
index a4394df..7177065 100644
--- 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 ();
@@ -564,6 +568,7 @@ init_debug_g_type (void)
 	g_type_init_with_debug_flags (gflags);
 }
 
+#ifndef DEBUG
 static void 
 null_log(const gchar* dom, 
 	 GLogLevelFlags l, 
@@ -572,6 +577,7 @@ null_log(const gchar* dom,
 {
 	return;
 };
+#endif
 
 static void
 init_debug_logging (void)
@@ -596,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);
@@ -749,10 +757,10 @@ init_default_settings (ModestConf *conf)
 		modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, NULL);
 
 	if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_INTERVAL, NULL))
-		modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_UPDATE_INTERVAL_15_MIN, NULL);
+		modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_UPDATE_INTERVAL_30_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);