X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-init.c;h=8a3b8680cdcd0ce959e8df4c67b16681e8bfb30b;hp=0cf8e7e0601f2bf6d413947abf5fb0ae9a72979b;hb=42b51c4f9cdf3e8ee29649f9d97e5ba074d907e5;hpb=f8ec795f1726017d14b4fe188ee63f8e9c2eea0a

diff --git a/src/modest-init.c b/src/modest-init.c
index 0cf8e7e..8a3b868 100644
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -49,6 +49,8 @@
 #include "widgets/modest-global-settings-dialog.h"
 #include "modest-tny-msg.h"
 #include <libgnomevfs/gnome-vfs.h>
+#include <string.h>
+
 #ifdef MODEST_PLATFORM_MAEMO
 #include "modest-hildon-includes.h"
 #endif
@@ -78,6 +80,7 @@ typedef struct {
 
 
 static const guint MODEST_MAIN_PANED_POS_PERCENTAGE = 30;
+static const guint MODEST_MSG_PANED_POS_PERCENTAGE = 50;
 
 static const FolderCols INBOX_COLUMNS_DETAILS[] = {
 	{MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40, 0},
@@ -178,17 +181,40 @@ modest_init_get_default_header_view_column_ids (TnyFolderType folder_type, Modes
 }
 
 
+static gboolean
+force_ke_recv_load (void)
+{
+	if (strcmp ("cerm_device_memory_full",
+		    dgettext("ke-recv", "cerm_device_memory_full")) == 0) {
+		g_warning ("%s: cannot get translation for cerm_device_memory_full",
+			   __FUNCTION__);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+
 gboolean
 modest_init (int argc, char *argv[])
 {
 	gboolean reset;
 
 	if (_is_initialized) {
-		g_printerr ("modest: modest_init_init_core may only be invoked once\n");
+		g_printerr ("modest: %s may only be invoked once\n", __FUNCTION__);
 		return FALSE;
 	} 
 	
 	init_i18n();
+
+	if (!force_ke_recv_load()) {
+		g_printerr ("modest: %s: ke-recv is missing "
+			    "or memory is very low\n", __FUNCTION__);
+		/* don't return FALSE here, because it might be that ke-recv is 
+		   missing. TODO: find a way to verify that
+		*/
+	}
+
 	init_debug_g_type();
 	init_debug_logging();
 
@@ -272,15 +298,15 @@ modest_init_uninit (void)
 	if (!_is_initialized)
 		return TRUE; 
 	
-	if (gnome_vfs_initialized()) /* apparently, this returns TRUE, even after a shutdown */
-		gnome_vfs_shutdown ();
-		
 	if (!modest_runtime_uninit())
 		g_printerr ("modest: failed to uninit runtime\n");
 
 	if (!modest_platform_uninit())
 		g_printerr ("modest: failed to uninit platform\n");
 	
+	if (gnome_vfs_initialized()) /* apparently, this returns TRUE, even after a shutdown */
+		gnome_vfs_shutdown ();
+		
 	_is_initialized = FALSE;
 	return TRUE;
 }
@@ -406,6 +432,15 @@ init_header_columns (ModestConf *conf, gboolean overwrite)
 		modest_conf_set_int (conf, key, MODEST_MAIN_PANED_POS_PERCENTAGE, NULL);
 	
 	g_free (key);
+
+	key = _modest_widget_memory_get_keyname (MODEST_CONF_MSG_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_MSG_PANED_POS_PERCENTAGE, NULL);
+	
+	g_free (key);
 	return TRUE;
 }