2004-12-07 [thorsten] 0.9.13cvs1

	* src/procmime.c
		[Bug 650] reply button causes crash
		Patch partly by David Relson

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 850a0d694fcc99ed03c143d97508ab71e93052a8..71ba874a865a38e3576ea8b3f1fbbb895392325a 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2004-12-07 [thorsten]  0.9.13cvs1
+
+       * src/procmime.c
+               [Bug 650] reply button causes crash
+               Patch partly by David Relson
+

 2004-12-06 [paul]      0.9.13
 
        0.9.13 released
 2004-12-06 [paul]      0.9.13
 
        0.9.13 released

diff --git a/PATCHSETS b/PATCHSETS
index 15a95997ea9ecf72600be8ff2333e2844ddd0329..9b24398db02b33db5945ce45a37781d0d15fead6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -170,3 +170,4 @@
 ( cvs diff -u -r 1.32 -r 1.33 INSTALL; cvs diff -u -r 1.27 -r 1.28 Makefile.am; cvs diff -u -r 1.38 -r 1.39 README.claws; cvs diff -u -r -1.33 -r -1.34 TODO.claws; cvs diff -u -r 1.29 -r 1.30 tools/Makefile.am; cvs diff -u -r 1.37 -r 1.38 tools/README; cvs diff -u -r 1.16 -r 1.17 tools/filter_conv.pl; cvs diff -u -r 1.5 -r 1.6 tools/kdeservicemenu/README; cvs diff -u -r 1.5 -r 1.6 tools/kdeservicemenu/template_sylpheed-attach-files.desktop; cvs diff -u -r 1.5 -r 1.6 tools/kdeservicemenu/template_sylpheed-compress-attach.desktop; ) > 0.9.12cvs185.patchset
 ( cvs diff -u -r 1.33 -r 1.34 INSTALL; cvs diff -u -r 1.39 -r 1.40 README.claws; cvs diff -u -r 1.71 -r 1.72 po/es.po; cvs diff -u -r 1.50 -r 1.51 po/fr.po; cvs diff -u -r 1.37 -r 1.38 po/it.po; cvs diff -u -r 1.23 -r 1.24 po/ja.po; cvs diff -u -r 1.52 -r 1.53 po/pt_BR.po; cvs diff -u -r 1.10 -r 1.11 po/zh_CN.po; ) > 0.9.12cvs186.patchset
 ( cvs diff -u -r 1.462 -r 1.463 src/compose.c; ) > 0.9.12cvs187.patchset
 ( cvs diff -u -r 1.32 -r 1.33 INSTALL; cvs diff -u -r 1.27 -r 1.28 Makefile.am; cvs diff -u -r 1.38 -r 1.39 README.claws; cvs diff -u -r -1.33 -r -1.34 TODO.claws; cvs diff -u -r 1.29 -r 1.30 tools/Makefile.am; cvs diff -u -r 1.37 -r 1.38 tools/README; cvs diff -u -r 1.16 -r 1.17 tools/filter_conv.pl; cvs diff -u -r 1.5 -r 1.6 tools/kdeservicemenu/README; cvs diff -u -r 1.5 -r 1.6 tools/kdeservicemenu/template_sylpheed-attach-files.desktop; cvs diff -u -r 1.5 -r 1.6 tools/kdeservicemenu/template_sylpheed-compress-attach.desktop; ) > 0.9.12cvs185.patchset
 ( cvs diff -u -r 1.33 -r 1.34 INSTALL; cvs diff -u -r 1.39 -r 1.40 README.claws; cvs diff -u -r 1.71 -r 1.72 po/es.po; cvs diff -u -r 1.50 -r 1.51 po/fr.po; cvs diff -u -r 1.37 -r 1.38 po/it.po; cvs diff -u -r 1.23 -r 1.24 po/ja.po; cvs diff -u -r 1.52 -r 1.53 po/pt_BR.po; cvs diff -u -r 1.10 -r 1.11 po/zh_CN.po; ) > 0.9.12cvs186.patchset
 ( cvs diff -u -r 1.462 -r 1.463 src/compose.c; ) > 0.9.12cvs187.patchset

+( cvs diff -u -r 1.97 -r 1.98 src/procmime.c; ) > 0.9.13cvs1.patchset

diff --git a/configure.ac b/configure.ac
index 25dd5e231f0a5d604e5b9e498ccfdf9cb6bbdcca..550a5b34fac5f42dac1408dc835d896a5ea2d0df 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=0
+EXTRA_VERSION=1

 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/procmime.c b/src/procmime.c
index b035ab29a17f7e1a8d7ae97eff7a03ed5d60ac28..ca4904901f56de7d352885e659b8cb1b73b03889 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -867,7 +867,7 @@ gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
                if (basetmp == NULL)
                        basetmp = "mimetmp";
                base = g_basename(basetmp);
                if (basetmp == NULL)
                        basetmp = "mimetmp";
                base = g_basename(basetmp);

-               if (*base == '\0') base = "mimetmp";
+               if (*basename == '\0') basename = g_strdup("mimetmp");

                Xstrdup_a(base, base, return NULL);
                subst_for_shellsafe_filename(base);
        }
                Xstrdup_a(base, base, return NULL);
                subst_for_shellsafe_filename(base);
        }