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

	* src/mimeview.c
		Sync with HEAD (Save All: only attachments)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 28e95a40ed6200619d3cc5a667337624cc8355ea..d35b844d8bd2d89543c78736f311a8362ba9ae9a 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-10-01 [colin]     0.9.12cvs117.1
+
+       * src/mimeview.c
+               Sync with HEAD (Save All: only attachments)
+

 2004-10-01 [paul]      0.9.12cvs116.1
 
        * ChangeLog.claws
 2004-10-01 [paul]      0.9.12cvs116.1
 
        * ChangeLog.claws

diff --git a/PATCHSETS b/PATCHSETS
index aec2c5b207be1e9d21c87cad0a0047751f8000d8..55027ff7848825c7e6f7a9ae82aedec5aceb8090 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -185,3 +185,4 @@
 ( cvs diff -u -r 1.382.2.47 -r 1.382.2.48 src/compose.c; ) > 0.9.12cvs114.1.patchset
 ( cvs diff -u -r 1.25.2.7 -r 1.25.2.8 src/stock_pixmap.c; cvs diff -u -r 1.18.2.4 -r 1.18.2.5 src/stock_pixmap.h; cvs diff -u -r 1.207.2.17 -r 1.207.2.18 src/folderview.c; cvs diff -u -r 1.155.2.11 -r 1.155.2.12 src/Makefile.am; cvs diff -u -r 0 -r 1 src/pixmaps/read.xpm; ) > 0.9.12cvs115.1.patchset
 ( 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.382.2.47 -r 1.382.2.48 src/compose.c; ) > 0.9.12cvs114.1.patchset
 ( cvs diff -u -r 1.25.2.7 -r 1.25.2.8 src/stock_pixmap.c; cvs diff -u -r 1.18.2.4 -r 1.18.2.5 src/stock_pixmap.h; cvs diff -u -r 1.207.2.17 -r 1.207.2.18 src/folderview.c; cvs diff -u -r 1.155.2.11 -r 1.155.2.12 src/Makefile.am; cvs diff -u -r 0 -r 1 src/pixmaps/read.xpm; ) > 0.9.12cvs115.1.patchset
 ( 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

diff --git a/configure.ac b/configure.ac
index 7b9d302cfea8eaec05c6291229d5d0b6de8da508..f646d814ca57e53e8b3be2ef50bc441477f358bb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=116
+EXTRA_VERSION=117

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/mimeview.c b/src/mimeview.c
index 649698a8fee86275c6854a082e04d9b3fe80d84a..122dbf8ba8709f142bf77dbc2e9be544e62faeba 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1077,7 +1077,7 @@ static void mimeview_save_all(MimeView *mimeview)
        while (partinfo != NULL) {
                if (partinfo->type != MIMETYPE_MESSAGE &&
                    partinfo->type != MIMETYPE_MULTIPART &&
        while (partinfo != NULL) {
                if (partinfo->type != MIMETYPE_MESSAGE &&
                    partinfo->type != MIMETYPE_MULTIPART &&

-                   partinfo->disposition != DISPOSITIONTYPE_INLINE) {
+                   partinfo->disposition == DISPOSITIONTYPE_ATTACHMENT) {

                        gchar *filename = mimeview_get_filename_for_part
                                (partinfo, dirname, number++);
 
                        gchar *filename = mimeview_get_filename_for_part
                                (partinfo, dirname, number++);