Revert "Add bottom send button in editor. It's only shown when the top button is"

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index 7a6a36c..332edbe 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -641,7 +641,6 @@ init_stock_icons (void)
                        { 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 },
@@ -655,7 +654,6 @@ init_stock_icons (void)
                        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,
@@ -775,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);