Modified webpage: now tinymail repository is in gitorious.

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index f911ea7..d5c0930 100644 (file)
--- 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,
@@ -732,10 +731,10 @@ init_default_settings (ModestConf *conf)
                modest_conf_set_bool (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL);
 
        if (!modest_conf_key_exists (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, NULL))
-               modest_conf_set_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, TRUE, NULL);
+               modest_conf_set_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, FALSE, NULL);
        
        if (!modest_conf_key_exists (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL))
-               modest_conf_set_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL);
+               modest_conf_set_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN, FALSE, NULL);
 
        /* Editor keys */
        if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_CC, NULL))
@@ -774,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);