X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-init.c;h=e3f54de6bab3b2f7d1933ed975cca0e08d1d3b58;hp=79247e0b79aaeb2ee5f3fd1fea1101d875f4056c;hb=d68cbedf16d65a87c290ecee24bb18fe9a1eb359;hpb=a9c81baad06ccbc6da7549a51bb1e6da27c8afb0

diff --git a/src/modest-init.c b/src/modest-init.c
index 79247e0..e3f54de 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
@@ -178,17 +180,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();
 
@@ -591,10 +616,10 @@ init_stock_icons (void)
 
 		static GtkStockItem items[] = {
 #ifdef MODEST_PLATFORM_MAEMO
-			{ MODEST_STOCK_SPLIT_VIEW, "split view", 0, 0, NULL },
 			{ MODEST_STOCK_SORT, "sort mail", 0, 0, NULL },
 			{ MODEST_STOCK_REFRESH, "refresh mail", 0, 0, NULL },
 #endif /*MODEST_PLATFORM_MAEMO*/
+			{ MODEST_STOCK_SPLIT_VIEW, "split view", 0, 0, NULL },
 			{ MODEST_STOCK_MAIL_SEND, "send mail", 0, 0, NULL },
 			{ MODEST_STOCK_NEW_MAIL, "new mail", 0, 0, NULL },
 /*  			{ MODEST_STOCK_SEND_RECEIVE, "send receive", 0, 0, NULL },  */
@@ -609,10 +634,10 @@ init_stock_icons (void)
       
 		static gchar *items_names [] = {
 #ifdef MODEST_PLATFORM_MAEMO
-			MODEST_TOOLBAR_ICON_SPLIT_VIEW,
 			MODEST_TOOLBAR_ICON_SORT,
 			MODEST_TOOLBAR_ICON_REFRESH,
 #endif /*MODEST_PLATFORM_MAEMO*/
+			MODEST_TOOLBAR_ICON_SPLIT_VIEW,
 			MODEST_TOOLBAR_ICON_MAIL_SEND,
 			MODEST_TOOLBAR_ICON_NEW_MAIL,
 /*  			MODEST_TOOLBAR_ICON_SEND_RECEIVE,  */
@@ -704,7 +729,7 @@ init_default_settings (ModestConf *conf)
 		modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, TRUE, NULL);
 
 	if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL))
-		modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN, 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);