X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-init.c;h=3bb54080a76b6810a98f1e5afaffec638d00b630;hb=f65dbac4cd60a472c891309e8052241a462e109e;hp=d0cc3e2a7eaef691cb1e1511d9fea3e738099b5e;hpb=2f8f9e570328c3e806e71f9df15c7dc921acd19a;p=modest

diff --git a/src/modest-init.c b/src/modest-init.c
index d0cc3e2..3bb5408 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
@@ -76,7 +77,7 @@ typedef struct {
 } FolderCols;
 
 
-static const guint MODEST_MAIN_PANED_POS = 280;
+static const guint MODEST_MAIN_PANED_POS_PERCENTAGE = 30;
 
 static const FolderCols INBOX_COLUMNS_DETAILS[] = {
 	{MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40, 0},
@@ -277,6 +278,9 @@ modest_init_uninit (void)
 	if (!modest_runtime_uninit())
 		g_printerr ("modest: failed to uninit runtime\n");
 
+	if (!modest_platform_uninit())
+		g_printerr ("modest: failed to uninit platform\n");
+	
 	_is_initialized = FALSE;
 	return TRUE;
 }
@@ -394,11 +398,12 @@ init_header_columns (ModestConf *conf, gboolean overwrite)
 		};
 	}
 	
-	key = _modest_widget_memory_get_keyname (MODEST_CONF_MAIN_PANED_KEY, MODEST_WIDGET_MEMORY_PARAM_POS);
+	key = _modest_widget_memory_get_keyname (MODEST_CONF_MAIN_PANED_KEY, 
+						 MODEST_WIDGET_MEMORY_PARAM_POS);
 	/* if we're not in overwrite mode, only write stuff it
 	 * there was nothing before */
 	if (overwrite || !modest_conf_key_exists(conf, key, NULL)) 
-		modest_conf_set_int (conf, key, MODEST_MAIN_PANED_POS, NULL);
+		modest_conf_set_int (conf, key, MODEST_MAIN_PANED_POS_PERCENTAGE, NULL);
 	
 	g_free (key);
 	return TRUE;
@@ -522,9 +527,9 @@ init_debug_g_type (void)
 	gflags = 0;
 	mflags = modest_runtime_get_debug_flags ();
 
-	if (mflags & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS)
+	if (mflags & MODEST_RUNTIME_DEBUG_OBJECTS)
 		gflags |= G_TYPE_DEBUG_OBJECTS;
-	if (mflags & MODEST_RUNTIME_DEBUG_DEBUG_SIGNALS)
+	if (mflags & MODEST_RUNTIME_DEBUG_SIGNALS)
 		gflags |= G_TYPE_DEBUG_SIGNALS;
 
 	g_type_init_with_debug_flags (gflags);
@@ -546,23 +551,28 @@ init_debug_logging (void)
 static void
 init_i18n (void)
 {
-	const gchar* gettext_package;
-	/* Setup gettext, to use our .po files: */
-	/* GETTEXT_PACKAGE and MODEST_LOCALE_DIR are defined in config.h */
-/* #ifdef MODEST_HILDON_VERSION_0 */
-/* 	gettext_package = GETTEXT_PACKAGE; */
-/* 	bindtextdomain (gettext_package, MODEST_LOCALE_DIR); */
-/* #else */
-/* 	gettext_package = "osso-email"; /\* HACK to use the localizations *\/ */
-/* 	bindtextdomain (gettext_package, "/usr/share/locale"); */
-/* #endif /\*MODEST_HILDON_VERSION_0*\/ */
-	
-	gettext_package = GETTEXT_PACKAGE;
-
-	bind_textdomain_codeset (gettext_package, "UTF-8");
-	textdomain (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 *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 ("LANGUAGE", language, 1);
+               g_free (language);
+	}
+	/* end of little trick */
+#endif /*MODEST_PLATFORM_MAEMO */
 
-	setlocale (LC_ALL, "");
+	bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
 }
 
 
@@ -591,8 +601,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 }, */
@@ -609,13 +619,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;