talons

commit 04a5feaf65f43b0285455ff7f8824d655824e682
parent 8212868d37fefbd34cb840aa51f139e6f27b2477
Author: Colin Leroy <colin@colino.net>
Date:   Sat,  7 Mar 2009 11:17:59 +0000

2009-03-07 [colin]	3.7.1cvs5

	* src/messageview.c
		Don't let the invalid MIME warning hide
		other noticeview (Partial receive or
		return receipt).

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/messageview.c
 | 
32
+++++++++++++++++++++-----------

4 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-07 [colin]	3.7.1cvs5
+
+	* src/messageview.c
+		Don't let the invalid MIME warning hide
+		other noticeview (Partial receive or 
+		return receipt).
+
 2009-03-07 [colin]	3.7.1cvs4
 
 	* src/procmime.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3744,3 +3744,4 @@
 ( cvs diff -u -r 1.487 -r 1.488 src/compose.c;  cvs diff -u -r 1.10 -r 1.11 src/folder_item_prefs.c;  cvs diff -u -r 1.6 -r 1.7 src/folder_item_prefs.h;  cvs diff -u -r 1.65 -r 1.66 src/prefs_folder_item.c;  ) > 3.7.1cvs2.patchset
 ( cvs diff -u -r 1.94.2.200 -r 1.94.2.201 src/messageview.c;  cvs diff -u -r 1.49.2.127 -r 1.49.2.128 src/procmime.c;  cvs diff -u -r 1.17.2.23 -r 1.17.2.24 src/procmime.h;  ) > 3.7.1cvs3.patchset
 ( cvs diff -u -r 1.49.2.128 -r 1.49.2.129 src/procmime.c;  ) > 3.7.1cvs4.patchset
+( cvs diff -u -r 1.94.2.201 -r 1.94.2.202 src/messageview.c;  ) > 3.7.1cvs5.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=4
+EXTRA_VERSION=5
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/messageview.c b/src/messageview.c
@@ -1226,17 +1226,6 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
 		}
 	}
 			
-	while ((brokeninfo = find_broken_part(mimeinfo)) != NULL) {
-		noticeview_show(messageview->noticeview);
-		noticeview_set_icon(messageview->noticeview,
-				    STOCK_PIXMAP_NOTICE_WARN);
-		noticeview_set_text(messageview->noticeview, _("Message doesn't conform to MIME standard. "
-					"It may render wrongly."));
-		gtk_widget_hide(messageview->noticeview->button);
-		gtk_widget_hide(messageview->noticeview->button2);
-		break;
-	}
-			
 	if (messageview->msginfo != msginfo) {
 		procmsg_msginfo_free(messageview->msginfo);
 		messageview->msginfo = NULL;
@@ -1305,6 +1294,27 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
 		return_receipt_show(messageview->noticeview, 
 				    messageview->msginfo);
 
+	while ((brokeninfo = find_broken_part(mimeinfo)) != NULL) {
+		noticeview_show(messageview->noticeview);
+		noticeview_set_icon(messageview->noticeview,
+				    STOCK_PIXMAP_NOTICE_WARN);
+		if (!noticeview_is_visible(messageview->noticeview)) {
+			noticeview_set_text(messageview->noticeview, _("Message doesn't conform to MIME standard. "
+						"It may render wrongly."));
+			gtk_widget_hide(messageview->noticeview->button);
+			gtk_widget_hide(messageview->noticeview->button2);
+		} else {
+			gchar *full = g_strconcat(
+					gtk_label_get_text(GTK_LABEL(messageview->noticeview->text)), 
+					"\n", 
+					_("Message doesn't conform to MIME standard. "
+					"It may render wrongly."), NULL);
+			noticeview_set_text(messageview->noticeview, full);
+			g_free(full);
+		}
+		break;
+	}
+			
 	mimeinfo = procmime_mimeinfo_next(mimeinfo);
 	if (!all_headers && mimeinfo 
 			&& (mimeinfo->type != MIMETYPE_TEXT ||