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 5d3189a..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>
@@ -186,7 +187,7 @@ force_ke_recv_load (void)
 {
        if (strcmp ("cerm_device_memory_full",
                    _KR("cerm_device_memory_full")) == 0) {
-               g_warning ("%s: cannot get translation for cerm_device_memory_full",
+               g_debug ("%s: cannot get translation for cerm_device_memory_full",
                           __FUNCTION__);
                return FALSE;
        }
@@ -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 ();
@@ -281,7 +285,7 @@ init_ui (gint argc, gchar** argv)
 {
        /* Set application name */
        g_set_application_name (modest_platform_get_app_name());
-       /* g_message (modest_platform_get_app_name()); */
+       /* g_debug (modest_platform_get_app_name()); */
 
        /* Init stock icons */
        init_stock_icons ();
@@ -564,11 +568,29 @@ init_debug_g_type (void)
        g_type_init_with_debug_flags (gflags);
 }
 
+#ifndef DEBUG
+static void 
+null_log(const gchar* dom, 
+        GLogLevelFlags l, 
+        const gchar* m, 
+        gpointer d)
+{
+       return;
+};
+#endif
+
 static void
 init_debug_logging (void)
 {
        ModestRuntimeDebugFlags mflags;
        mflags = modest_runtime_get_debug_flags ();
+
+#ifndef DEBUG
+       if (! (mflags & MODEST_RUNTIME_DEBUG_CODE)) {
+               g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, null_log, NULL);
+       }
+#endif
+
        
        if (mflags & MODEST_RUNTIME_DEBUG_ABORT_ON_WARNING)
                g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
@@ -580,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);
@@ -680,7 +704,7 @@ init_stock_icons (void)
                                g_object_unref (pixbuf);
                        }
                        else
-                               g_warning ("Modest: %s: failed to load %s icon", __FUNCTION__, items_names[i]);
+                               g_warning ("%s: failed to load %s icon", __FUNCTION__, items_names[i]);
                }
                /* Drop our reference to the factory, GTK will hold a reference. */
                g_object_unref (factory);
@@ -736,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);