Remove Hildon1 conditional code from hildon2.

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index 1dc9f3c..44add04 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -250,7 +250,7 @@ modest_init (int argc, char *argv[])
        modest_address_book_init ();
 
        reset = modest_runtime_get_debug_flags () & MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS;
-       if (!init_header_columns(modest_runtime_get_conf(), reset)) {
+       if (!init_header_columns(modest_runtime_get_conf(), TRUE)) {
                modest_init_uninit ();
                g_printerr ("modest: failed to init header columns\n");
                return FALSE;
@@ -608,7 +608,11 @@ init_i18n (void)
                setenv ("LANGUAGE", "en_GB", 1);
                setenv ("LC_MESSAGES", "en_GB", 1);
        } else {
-               setenv ("LC_MESSAGES", lc_messages, 1);
+               gchar *new_lc_messages;
+               new_lc_messages = g_strconcat (lc_messages, ":en_GB", NULL);
+               setenv ("LANGUAGE", new_lc_messages, 1);
+               setenv ("LC_MESSAGES", new_lc_messages, 1);
+               g_free (new_lc_messages);
        }
 
        bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
@@ -757,7 +761,7 @@ 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, 100, NULL);