2005-02-10 [colin] 1.0.1cvs2.1

	* src/messageview.c
		Synw with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index f7a439655cc7c3c03be1c1065962013b0b5455e1..91835a06cdb57645b373371a475aa309db79bfbd 100644 (file)
--- 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 7d69429ed3501c1cd69b409f028c4bf526e6f299..96dc4a8369b1089aa1b76e30d749991f8d762aa8 100644 (file)
--- 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 02729c0bb6ea7687bb5ba8def103fe3dd617ed39..6aadb381e4f3ed04d5eb21d57a7fce08925065f2 100644 (file)
--- 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 44700e34c74a3410a3890491dd298f7aff57e460..94936a566b5fe5ef03a893cdfbc0021cbcf53995 100644 (file)
--- 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);
        }