2006-06-28 [colin] 2.3.1cvs33

	* src/mimeview.c
		Fix previous

diff --git a/ChangeLog b/ChangeLog
index f989f814bbc4a6bd2b160ce3772a94bb363e25f6..6580644bcc41d82fcb6cb9ca43eff5888bb71059 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-28 [colin]     2.3.1cvs33
+
+       * src/mimeview.c
+               Fix previous
+
 2006-06-28 [colin]     2.3.1cvs32
 
        * src/mimeview.c

diff --git a/PATCHSETS b/PATCHSETS
index 39127fb3c64e23b110eb3563d4a0333fd3ed4865..cca855ffe7f9c5f6fbf0852af8963a7a71b5cd45 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1633,3 +1633,4 @@
 ( cvs diff -u -r 1.5.2.31 -r 1.5.2.32 src/gtk/gtkutils.c;  ) > 2.3.1cvs30.patchset
 ( cvs diff -u -r 1.179.2.122 -r 1.179.2.123 src/imap.c;  cvs diff -u -r 1.52.2.22 -r 1.52.2.23 src/prefs_folder_item.c;  ) > 2.3.1cvs31.patchset
 ( cvs diff -u -r 1.115.2.91 -r 1.115.2.92 src/main.c;  cvs diff -u -r 1.28.2.21 -r 1.28.2.22 src/mbox.c;  cvs diff -u -r 1.83.2.71 -r 1.83.2.72 src/mimeview.c;  cvs diff -u -r 1.13.2.18 -r 1.13.2.19 src/common/plugin.c;  cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/common/plugin.h;  cvs diff -u -r 1.7.2.7 -r 1.7.2.8 src/common/sylpheed.c;  cvs diff -u -r 1.36.2.68 -r 1.36.2.69 src/common/utils.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/sylpheed.def;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpinline/sylpheed.def;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/sylpheed.def;  ) > 2.3.1cvs32.patchset
+( cvs diff -u -r 1.83.2.72 -r 1.83.2.73 src/mimeview.c;  ) > 2.3.1cvs33.patchset

diff --git a/configure.ac b/configure.ac
index a01185d2b69262451675c7bc34a6dbf8d9787ab9..1b3156b0880928ae282f2d5f58fb9cf5114c05c4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mimeview.c b/src/mimeview.c
index 0718c98f0d7bcc24559131ef6d550ca258ab0402..aceae851cf32a99c27b03e116e5ef5ac9cca397d 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -430,13 +430,22 @@ static void mimeview_set_multipart_tree(MimeView *mimeview,
        }
 }
 
-static const gchar *get_part_name(MimeInfo *partinfo)
+static const gchar *get_real_part_name(MimeInfo *partinfo)
 {
-       const gchar *name;
+       const gchar *name = NULL;
 
        name = procmime_mimeinfo_get_parameter(partinfo, "filename");
        if (name == NULL)
                name = procmime_mimeinfo_get_parameter(partinfo, "name");
+
+       return name;
+}
+
+static const gchar *get_part_name(MimeInfo *partinfo)
+{
+       const gchar *name;
+
+       name = get_real_part_name(partinfo);
        if (name == NULL)
                name = "";
 
@@ -1440,7 +1449,7 @@ static void mimeview_save_all(MimeView *mimeview)
                if (partinfo->type != MIMETYPE_MESSAGE &&
                    partinfo->type != MIMETYPE_MULTIPART &&
                    (partinfo->disposition != DISPOSITIONTYPE_INLINE
-                    || get_part_name(partinfo) != NULL)) {
+                    || get_real_part_name(partinfo) != NULL)) {
                        gchar *filename = mimeview_get_filename_for_part
                                (partinfo, dirname, number++);