From 834e7ffcfd9a805c97e6ef1b253d43f79387595a Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 10 Feb 2005 08:36:52 +0000 Subject: [PATCH] 2005-02-10 [colin] 1.0.1cvs2.1 * src/messageview.c Synw with HEAD --- ChangeLog-gtk2.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 4 ++-- src/messageview.c | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index f7a439655..91835a06c 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2005-02-10 [colin] 1.0.1cvs2.1 + + * src/messageview.c + Synw with HEAD + 2005-02-09 [colin] 1.0.1cvs1.3 * src/textview.c diff --git a/PATCHSETS b/PATCHSETS index 7d69429ed..96dc4a836 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -366,3 +366,4 @@ ( cvs diff -u -r 1.94.2.42 -r 1.94.2.43 src/messageview.c; cvs diff -u -r 1.83.2.27 -r 1.83.2.28 src/mimeview.c; cvs diff -u -r 1.20.2.2 -r 1.20.2.3 src/mimeview.h; ) > 1.0.1cvs1.1.patchset ( cvs diff -u -r 1.65.2.21 -r 1.65.2.22 src/codeconv.c; ) > 1.0.1cvs1.2.patchset ( cvs diff -u -r 1.96.2.42 -r 1.96.2.43 src/textview.c; cvs diff -u -r 1.12.2.3 -r 1.12.2.4 src/textview.h; ) > 1.0.1cvs1.3.patchset +( cvs diff -u -r 1.94.2.43 -r 1.94.2.44 src/messageview.c; ) > 1.0.1cvs2.1.patchset diff --git a/configure.ac b/configure.ac index 02729c0bb..6aadb381e 100644 --- a/configure.ac +++ b/configure.ac @@ -11,9 +11,9 @@ MINOR_VERSION=0 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=1 +EXTRA_VERSION=2 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.3 +EXTRA_GTK2_VERSION=.1 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} diff --git a/src/messageview.c b/src/messageview.c index 44700e34c..94936a566 100644 --- a/src/messageview.c +++ b/src/messageview.c @@ -751,7 +751,8 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo, mimeinfo = procmime_mimeinfo_next(mimeinfo); if (mimeinfo && (mimeinfo->type != MIMETYPE_TEXT || - strcmp(mimeinfo->subtype, "plain"))) { + (strcmp(mimeinfo->subtype, "plain") && + strcmp(mimeinfo->subtype, "html")))) { mimeview_show_part(messageview->mimeview,mimeinfo); } -- 2.25.1