talons

commit a527b6776e0c30a638346283e90c37e051ee8588
parent ee048ca2b29fe5c09ad160a765fb8a263e3c5017
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 13 Aug 2008 16:03:12 +0000

2008-08-13 [colin]	3.5.0cvs58

	* src/messageview.c
	* src/messageview.h
	* src/mimeview.c
		Fix bug 1696, 'Viewing binary attachements
		as text over 1 MB' (various buglets)

Diffstat:
M
src/messageview.c
 | 
5
++++-
M
src/messageview.h
 | 
1
+
M
src/mimeview.c
 | 
5
+++++

3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/messageview.c b/src/messageview.c
@@ -1672,8 +1672,10 @@ static void messageview_show_partial_display_cb(NoticeView *noticeview, MessageV
 {
 	messageview->show_full_text = TRUE;
 	main_window_cursor_wait(mainwindow_get_mainwindow());
+	noticeview_hide(messageview->noticeview);
+	messageview->partial_display_shown = FALSE;
 	GTK_EVENTS_FLUSH();
-	messageview_show(messageview, messageview->msginfo, messageview->all_headers);
+	mimeview_handle_cmd(messageview->mimeview, "sc://display_as_text", NULL, NULL);
 	main_window_cursor_normal(mainwindow_get_mainwindow());
 }
 
@@ -1689,6 +1691,7 @@ void messageview_show_partial_display(MessageView *messageview, MsgInfo *msginfo
 					     G_CALLBACK(messageview_show_partial_display_cb),
 					     (gpointer) messageview);
 	noticeview_show(messageview->noticeview);
+	messageview->partial_display_shown = TRUE;
 }
 
 static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
diff --git a/src/messageview.h b/src/messageview.h
@@ -76,6 +76,7 @@ struct _MessageView
 	gboolean deferred_destroy;
 	
 	gboolean show_full_text;
+	gboolean partial_display_shown;
 	GtkUIManager *ui_manager;
 };
 
diff --git a/src/mimeview.c b/src/mimeview.c
@@ -744,6 +744,11 @@ gboolean mimeview_show_part(MimeView *mimeview, MimeInfo *partinfo)
 {
 	MimeViewer *viewer;
 	
+	if (mimeview->messageview->partial_display_shown) {
+		noticeview_hide(mimeview->messageview->noticeview);
+		mimeview->messageview->partial_display_shown = FALSE;
+	}
+
 	viewer = get_viewer_for_mimeinfo(mimeview, partinfo);
 	if (viewer == NULL) {
 		if (mimeview->mimeviewer != NULL)