2012-08-12 [colin] 3.8.1cvs30
authorColin Leroy <colin@colino.net>
Sun, 12 Aug 2012 10:10:36 +0000 (10:10 +0000)
committerColin Leroy <colin@colino.net>
Sun, 12 Aug 2012 10:10:36 +0000 (10:10 +0000)
* 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

ChangeLog
PATCHSETS
configure.ac
src/common/ssl.c
src/messageview.c

index 698d9fd6d828179e0e8a1a8e230ff38b1e124104..6665e4298d4839a3250343cf47b3b0a62626413e 100644 (file)
--- 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
index 7e627286ed404a02cdbc9af6fbdb5e3d59671e76..bda76beb296276a25e7b47ad8489a9fc193f6c00 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index b664c29845f2a36dc2c81b302d24dd39b08bbb84..cc824e7dd85fdcbcc52e01553fb9618aea7cd6af 100644 (file)
@@ -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=
 
index 9e8b242b7548bfac03a7cb5a6cab89043de7cc5a..c87ed4316784eeca832aff075c6a9d9041811af7 100644 (file)
@@ -152,7 +152,7 @@ const gchar *claws_ssl_get_cert_dir(void)
        }
        return NULL;
 #else
-       return "put_what_s_needed_here";
+       return NULL;
 #endif
 }
 
index bfd8d1b3684f011a357dcce5618c159f7fa53672..440c9db33e25aeb1339825aa4a2bc58d26866ebe 100644 (file)
@@ -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;