talons

commit 2b02f42504f10133602e883a1d5d884e770531db
parent 461297bc4f9e47f5e28f01e8f7b3ee3ba211e176
Author: Colin Leroy <colin@colino.net>
Date:   Sun, 12 Aug 2012 10:10:36 +0000

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

Diffstat:
M
ChangeLog
 | 
10
++++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/ssl.c
 | 
2
+-
M
src/messageview.c
 | 
3
+++

5 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+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
+
 2012-08-12 [colin]	3.8.1cvs29
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4404,3 +4404,4 @@
 ( cvs diff -u -r 1.9.2.36 -r 1.9.2.37 src/gtk/sslcertwindow.c;  ) > 3.8.1cvs27.patchset
 ( cvs diff -u -r 1.59.2.90 -r 1.59.2.91 src/prefs_filtering.c;  ) > 3.8.1cvs28.patchset
 ( cvs diff -u -r 1.382.2.607 -r 1.382.2.608 src/compose.c;  ) > 3.8.1cvs29.patchset
+( cvs diff -u -r 1.94.2.235 -r 1.94.2.236 src/messageview.c;  cvs diff -u -r 1.9.2.54 -r 1.9.2.55 src/common/ssl.c;  ) > 3.8.1cvs30.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=29
+EXTRA_VERSION=30
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/ssl.c b/src/common/ssl.c
@@ -152,7 +152,7 @@ const gchar *claws_ssl_get_cert_dir(void)
 	}
 	return NULL;
 #else
-	return "put_what_s_needed_here";
+	return NULL;
 #endif
 }
 
diff --git a/src/messageview.c b/src/messageview.c
@@ -1469,6 +1469,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
 						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 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
 						 * 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 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
 						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;