X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-init.c;h=79247e0b79aaeb2ee5f3fd1fea1101d875f4056c;hb=a3966167004d901791014719da71326403dbdf3e;hp=619b31e90fab4c8f5b4312fd6d8b8f058aabe2bd;hpb=0fb332b6dc8b4e67b7f13ab60563a4205b2be743;p=modest

diff --git a/src/modest-init.c b/src/modest-init.c
index 619b31e..79247e0 100644
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -48,6 +48,7 @@
 #include <modest-icon-names.h>
 #include "widgets/modest-global-settings-dialog.h"
 #include "modest-tny-msg.h"
+#include <libgnomevfs/gnome-vfs.h>
 #ifdef MODEST_PLATFORM_MAEMO
 #include "modest-hildon-includes.h"
 #endif
@@ -550,31 +551,26 @@ init_debug_logging (void)
 static void
 init_i18n (void)
 {
-	const gchar* gettext_package;
-
-#ifdef MODEST_PLATFORM_MAEMO
-	/* 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 *lang = getenv ("LANG");
-	if (!lang) 
+       /* 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);
-	else {
-		gchar *language = g_strdup_printf ("%s:en_GB", lang);
-		setenv ("LANGUAGE", language, 1);
-		g_free (language);
+		setenv ("LC_MESSAGES", "en_GB", 1);
+	} else {
+		gchar *language = g_strdup_printf ("%s:en_GB", lc_messages);
+               setenv ("LANGUAGE", language, 1);
+               g_free (language);
 	}
 	/* end of little trick */
-#endif /*MODEST_PLATFORM_MAEMO */
-	
-	gettext_package = GETTEXT_PACKAGE;
-
-	bind_textdomain_codeset (gettext_package, "UTF-8");
-	textdomain (gettext_package);
 
-	setlocale (LC_ALL, "");
+	bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
 }
 
 
@@ -603,8 +599,8 @@ init_stock_icons (void)
 			{ MODEST_STOCK_NEW_MAIL, "new mail", 0, 0, NULL },
 /*  			{ MODEST_STOCK_SEND_RECEIVE, "send receive", 0, 0, NULL },  */
 			{ MODEST_STOCK_REPLY, "reply", 0, 0, NULL },
-/* 			{ MODEST_STOCK_REPLY_ALL, "reply all", 0, 0, NULL }, */
-/* 			{ MODEST_STOCK_FORWARD, "forward", 0, 0, NULL }, */
+			{ MODEST_STOCK_REPLY_ALL, "reply all", 0, 0, NULL },
+			{ MODEST_STOCK_FORWARD, "forward", 0, 0, NULL },
  			{ MODEST_STOCK_DELETE, "delete", 0, 0, NULL }, 
 /* 			{ MODEST_STOCK_NEXT, "next", 0, 0, NULL }, */
 /* 			{ MODEST_STOCK_PREV, "prev", 0, 0, NULL }, */
@@ -621,13 +617,13 @@ init_stock_icons (void)
 			MODEST_TOOLBAR_ICON_NEW_MAIL,
 /*  			MODEST_TOOLBAR_ICON_SEND_RECEIVE,  */
 			MODEST_TOOLBAR_ICON_REPLY,	
-/* 			MODEST_TOOLBAR_ICON_REPLY_ALL, */
-/* 			MODEST_TOOLBAR_ICON_FORWARD, */
+			MODEST_TOOLBAR_ICON_REPLY_ALL,
+			MODEST_TOOLBAR_ICON_FORWARD,
  			MODEST_TOOLBAR_ICON_DELETE, 
 /* 			MODEST_TOOLBAR_ICON_NEXT, */
 /* 			MODEST_TOOLBAR_ICON_PREV, */
 /* 			MODEST_TOOLBAR_ICON_STOP */
-			MODEST_TOOLBAR_ICON_FORMAT_BULLETS,
+/* 			MODEST_TOOLBAR_ICON_FORMAT_BULLETS, */
 		};
 
 		registered = TRUE;
@@ -724,6 +720,9 @@ init_default_settings (ModestConf *conf)
 
 	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);
+
+	if (!modest_conf_key_exists (conf, MODEST_CONF_FETCH_HTML_EXTERNAL_IMAGES, NULL))
+		modest_conf_set_bool (conf, MODEST_CONF_FETCH_HTML_EXTERNAL_IMAGES, FALSE, NULL);
 }
 
 
@@ -734,7 +733,7 @@ init_default_settings (ModestConf *conf)
 static void
 init_device_name (ModestConf *conf)
 {
-	unsigned int len = 255; /* max len */
+	gsize len = 255; /* max len */
 	gchar *devname = NULL;
 	
 	if (!g_file_get_contents("/etc/hostname", &devname, &len, NULL) || len < 2 || len > 254) {