( 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
}
}
- 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;
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 ||