2004-10-01 [colin] 0.9.12cvs118.1

	* src/mimeview.c
		Sync with HEAD (better Save All fix)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 485e334c6add1ffe346fc6ac505b01419c8a56d6..a3ab88734b34d8ec26174742ffbb849714da2345 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-10-01 [colin]     0.9.12cvs118.1
+
+       * src/mimeview.c
+               Sync with HEAD (better Save All fix)
+
 2004-10-01 [colin]     0.9.12cvs117.2
 
        * src/gtk/gtksctree.c

diff --git a/PATCHSETS b/PATCHSETS
index 4edc8ba08a6db2ecaa65d8e1294637733c94bfa3..94dbca2d98ec2796aae8644930eed6e55c00c3cb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -187,3 +187,4 @@
 ( cvs diff -u -r 1.2504.2.22 -r 1.2504.2.23 ChangeLog.claws; cvs diff -u -r 1.654.2.218 -r 1.654.2.219 configure.ac; cvs diff -u -r 1.61.2.11 -r 1.61.2.12 src/account.c; cvs diff -u -r 1.204.2.20 -r 1.204.2.21 src/prefs_common.c; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/gtk/colorlabel.c; ) > 0.9.12cvs116.1.patchset
 ( cvs diff -u -r 1.83.2.19 -r 1.83.2.20 src/mimeview.c; ) > 0.9.12cvs117.1.patchset
 ( cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/gtk/gtksctree.c; ) > 0.9.12cvs117.2.patchset
+( cvs diff -u -r 1.83.2.20 -r 1.83.2.21 src/mimeview.c; ) > 0.9.12cvs118.1.patchset

diff --git a/configure.ac b/configure.ac
index f8f5ae7db252db0edb9cdade1c9a925e4f01502f..369683340bbff16f89ec9c81dbd538e3185584ba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=117
+EXTRA_VERSION=118
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+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/mimeview.c b/src/mimeview.c
index 122dbf8ba8709f142bf77dbc2e9be544e62faeba..07e4b89a7d91bd609e2243422058015829c3a94e 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1074,10 +1074,19 @@ static void mimeview_save_all(MimeView *mimeview)
        if (dirname[strlen(dirname)-1] == G_DIR_SEPARATOR)
                dirname[strlen(dirname)-1] = '\0';
 
+       /* Skip the first part, that is sometimes DISPOSITIONTYPE_UNKNOWN */
+       if (partinfo && partinfo->type == MIMETYPE_MESSAGE)
+               partinfo = procmime_mimeinfo_next(partinfo);
+       if (partinfo && partinfo->type == MIMETYPE_MULTIPART) {
+               partinfo = procmime_mimeinfo_next(partinfo);
+               if (partinfo && partinfo->type == MIMETYPE_TEXT)
+                       partinfo = procmime_mimeinfo_next(partinfo);
+       }
+               
        while (partinfo != NULL) {
                if (partinfo->type != MIMETYPE_MESSAGE &&
                    partinfo->type != MIMETYPE_MULTIPART &&
-                   partinfo->disposition == DISPOSITIONTYPE_ATTACHMENT) {
+                   partinfo->disposition != DISPOSITIONTYPE_INLINE) {
                        gchar *filename = mimeview_get_filename_for_part
                                (partinfo, dirname, number++);