added the option to treat HTML only messages as attachment.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1947 ee746299-78ed-0310-b773-934348b2243d

2 files changed, 9 insertions, 1 deletions

diff --git a/src/messageview.c b/src/messageview.c
index 59e2bb3d..828c442b 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -520,7 +520,8 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
 	textview_set_all_headers(messageview->mimeview->textview, all_headers);
 
 	if (mimeinfo->mime_type != MIME_TEXT &&
-	    mimeinfo->mime_type != MIME_TEXT_HTML) {
+	    (prefs_common.html_only_as_attach ||
+	     mimeinfo->mime_type != MIME_TEXT_HTML)) {
 		messageview_change_view_type(messageview, MVIEW_MIME);
 		mimeview_show_message(messageview->mimeview, mimeinfo, file);
 	} else {
diff --git a/src/prefs_common_dialog.c b/src/prefs_common_dialog.c
index df1dcb00..7c8bed77 100644
--- a/src/prefs_common_dialog.c
+++ b/src/prefs_common_dialog.c
@@ -143,6 +143,7 @@ static struct Message {
 	GtkWidget *chkbtn_disphdrpane;
 	GtkWidget *chkbtn_disphdr;
 	GtkWidget *chkbtn_html;
+	GtkWidget *chkbtn_htmlonly;
 	GtkWidget *spinbtn_linespc;
 	GtkObject *spinbtn_linespc_adj;
 
@@ -386,6 +387,8 @@ static PrefsUIData ui_data[] = {
 	 prefs_set_data_from_toggle, prefs_set_toggle},
 	{"render_html", &message.chkbtn_html,
 	 prefs_set_data_from_toggle, prefs_set_toggle},
+	{"html_only_as_attach", &message.chkbtn_htmlonly,
+	 prefs_set_data_from_toggle, prefs_set_toggle},
 	{"line_space", &message.spinbtn_linespc,
 	 prefs_set_data_from_spinbtn, prefs_set_spinbtn},
 
@@ -1573,6 +1576,7 @@ static GtkWidget *prefs_message_create(void)
 	GtkWidget *chkbtn_disphdr;
 	GtkWidget *button_edit_disphdr;
 	GtkWidget *chkbtn_html;
+	GtkWidget *chkbtn_htmlonly;
 	GtkWidget *hbox_linespc;
 	GtkWidget *label_linespc;
 	GtkObject *spinbtn_linespc_adj;
@@ -1646,6 +1650,8 @@ static GtkWidget *prefs_message_create(void)
 
 	PACK_CHECK_BUTTON(vbox2, chkbtn_html,
 			  _("Render HTML messages as text"));
+	PACK_CHECK_BUTTON(vbox2, chkbtn_htmlonly,
+			  _("Treat HTML only messages as attachment"));
 
 #if 0
 	PACK_CHECK_BUTTON(vbox2, chkbtn_cursor,
@@ -1737,6 +1743,7 @@ static GtkWidget *prefs_message_create(void)
 	message.chkbtn_disphdrpane = chkbtn_disphdrpane;
 	message.chkbtn_disphdr     = chkbtn_disphdr;
 	message.chkbtn_html        = chkbtn_html;
+	message.chkbtn_htmlonly    = chkbtn_htmlonly;
 	message.spinbtn_linespc    = spinbtn_linespc;
 
 	message.chkbtn_smoothscroll    = chkbtn_smoothscroll;