Fixes NB#115922, do not show duplicate entries in Country list

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index f62b431..5d3189a 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -580,22 +580,12 @@ init_debug_logging (void)
 static void
 init_i18n (void)
 {
-       /* little trick make en_GB the fallback language, instead
-        * of the logical IDs
-        * we need the ugly ifdefs, because modest_platform_init is
-        * too late.
-        */
        const gchar *lc_messages = getenv ("LC_MESSAGES");
 
        if (!lc_messages) {
                setenv ("LANGUAGE", "en_GB", 1);
                setenv ("LC_MESSAGES", "en_GB", 1);
-       } else {
-               gchar *language = g_strdup_printf ("%s:en_GB", lc_messages);
-               setenv ("LC_MESSAGES", language, 1);
-               g_free (language);
        }
-       /* end of little trick */
 
        bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -751,8 +741,13 @@ init_default_settings (ModestConf *conf)
        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);
 
+#ifdef MODEST_TOOLKIT_GTK
+       /* In Gnome port, we only allow editting plain text */
+       modest_conf_set_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, FALSE, NULL);
+#else
        if (!modest_conf_key_exists (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, NULL))
                modest_conf_set_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, TRUE, NULL);
+#endif
 
        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);