X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-init.c;h=332edbe9fe5aa9ec945fe89f606122b1e6a95f3d;hb=f545238bb5378f9263bbbed3bf89cb50b434357c;hp=88d9459d8fc3f8bdd6c71bb44c7c2e7cfb80fa57;hpb=d7a45e73cf533379b3da8bdb20ad7d9ad226f3ad;p=modest

diff --git a/src/modest-init.c b/src/modest-init.c
index 88d9459..332edbe 100644
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -53,11 +53,10 @@
 #include <libgnomevfs/gnome-vfs.h>
 #include <string.h>
 #include "modest-text-utils.h"
-
-#ifndef MODEST_TOOLKIT_GTK
+#include <locale.h>
+#ifdef MODEST_TOOLKIT_HILDON2
 #include "modest-hildon-includes.h"
 #endif
-#include <locale.h>
 
 static gboolean init_header_columns (ModestConf *conf, gboolean overwrite);
 static gboolean init_default_account_maybe  (ModestAccountMgr *acc_mgr);
@@ -185,12 +184,14 @@ modest_init_get_default_header_view_column_ids (TnyFolderType folder_type, Modes
 static gboolean
 force_ke_recv_load (void)
 {
+#ifdef MODEST_PLATFORM_MAEMO
 	if (strcmp ("cerm_device_memory_full",
 		    _KR("cerm_device_memory_full")) == 0) {
 		g_debug ("%s: cannot get translation for cerm_device_memory_full",
 			   __FUNCTION__);
 		return FALSE;
 	}
+#endif
 
 	return TRUE;
 }
@@ -636,11 +637,10 @@ init_stock_icons (void)
 		gint i;
 
 		static GtkStockItem items[] = {
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON2
 			{ MODEST_STOCK_SORT, "sort mail", 0, 0, NULL },
 			{ MODEST_STOCK_REFRESH, "refresh mail", 0, 0, NULL },
 #endif /*MODEST_TOOLKIT_GTK*/
-			{ 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_REPLY, "reply", 0, 0, NULL },
@@ -650,11 +650,10 @@ init_stock_icons (void)
 		};
 
 		static gchar *items_names [] = {
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON2
 			MODEST_TOOLBAR_ICON_SORT,
 			MODEST_TOOLBAR_ICON_REFRESH,
 #endif /*MODEST_TOOLKIT_GTK*/
-			MODEST_TOOLBAR_ICON_SPLIT_VIEW,
 			MODEST_TOOLBAR_ICON_MAIL_SEND,
 			MODEST_TOOLBAR_ICON_NEW_MAIL,
 			MODEST_TOOLBAR_ICON_REPLY,
@@ -756,6 +755,12 @@ init_default_settings (ModestConf *conf)
 	if (!modest_conf_key_exists (conf, MODEST_CONF_AUTO_UPDATE, NULL))
 		modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, TRUE, NULL);
 
+	if (!modest_conf_key_exists (conf, MODEST_CONF_NOTIFICATIONS, NULL))
+		modest_conf_set_bool (conf, MODEST_CONF_NOTIFICATIONS, TRUE, NULL);
+
+	if (!modest_conf_key_exists (conf, MODEST_CONF_AUTO_ADD_TO_CONTACTS, NULL))
+		modest_conf_set_bool (conf, MODEST_CONF_AUTO_ADD_TO_CONTACTS, 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_OR_WIMAX, NULL);
 
@@ -768,13 +773,8 @@ init_default_settings (ModestConf *conf)
 	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);
 
-#ifdef MODEST_TOOLKIT_GTK
-	/* In Gnome port, we only allow editting plain text */
-	modest_conf_set_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, FALSE, NULL);
-#else
 	if (!modest_conf_key_exists (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, NULL))
 		modest_conf_set_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, TRUE, NULL);
-#endif
 
 	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);