projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the proper logical id for the "New" button in Move message dialog
[modest]
/
src
/
modest-init.c
diff --git
a/src/modest-init.c
b/src/modest-init.c
index
f3f3c2c
..
0a38520
100644
(file)
--- a/
src/modest-init.c
+++ b/
src/modest-init.c
@@
-603,12
+603,16
@@
static void
init_i18n (void)
{
const gchar *lc_messages = setlocale (LC_MESSAGES, NULL);
init_i18n (void)
{
const gchar *lc_messages = setlocale (LC_MESSAGES, NULL);
+ gchar *new_lc_messages;
if (!lc_messages) {
setenv ("LANGUAGE", "en_GB", 1);
setenv ("LC_MESSAGES", "en_GB", 1);
} else {
if (!lc_messages) {
setenv ("LANGUAGE", "en_GB", 1);
setenv ("LC_MESSAGES", "en_GB", 1);
} else {
- setenv ("LC_MESSAGES", lc_messages, 1);
+ 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);
}
bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
@@
-757,10
+761,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_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))
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);
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);