[Commits] messageview.c 1.94.2.235 1.94.2.236

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv23004/src

Modified Files:
      Tag: gtk2
	messageview.c 
Log Message:
2012-08-12 [colin]	3.8.1cvs30

	* src/messageview.c
		Only show HTML parts by default (if the pref
		is set so) if the part disposition-type is
		inline or unknown, but not attachment.
	* src/common/ssl.c
		Remove useless hook that won't ever be used
		on windows

Index: messageview.c
===================================================================
RCS file: /home/claws-mail/claws/src/messageview.c,v
retrieving revision 1.94.2.235
retrieving revision 1.94.2.236
diff -u -d -r1.94.2.235 -r1.94.2.236
--- messageview.c	10 Jul 2012 21:13:07 -0000	1.94.2.235
+++ messageview.c	12 Aug 2012 10:10:36 -0000	1.94.2.236
@@ -1469,6 +1469,7 @@
 						goto done;
 					} else if (mimeinfo->type == MIMETYPE_TEXT && 
 					    !strcasecmp(mimeinfo->subtype, "html") &&
+					    mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT &&
 					    prefs_common.promote_html_part) {
 						mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
 						goto done;
@@ -1487,6 +1488,7 @@
 						 * not to show html attachments */
 						continue;
 					}
+					
 					if (mimeinfo->type == MIMETYPE_TEXT && 
 					    !strcasecmp(mimeinfo->subtype, "calendar") &&
 					    mimeview_has_viewer_for_content_type(messageview->mimeview,
@@ -1495,6 +1497,7 @@
 						goto done;
 					} else if (mimeinfo->type == MIMETYPE_TEXT && 
 					    !strcasecmp(mimeinfo->subtype, "html") &&
+					    mimeinfo->disposition != DISPOSITIONTYPE_ATTACHMENT &&
 					    prefs_common.promote_html_part) {
 						mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
 						goto done;