2004-12-07 [torte] 0.9.13cvs2.2

	* src/procmime.c
		[Bug 650] reply button causes crash
		Thanks to David Relson and Christoph

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index d2a41550236e4fef7fbbd2515b5a448d50ac9aac..39bc7a2f2ca844c5280f7e0b75990460120cfd21 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-12-07 [torte]     0.9.13cvs2.2
+
+       * src/procmime.c
+               [Bug 650] reply button causes crash
+               Thanks to David Relson and Christoph
+
 2004-12-07 [colin]     0.9.13cvs2.1
 
        * ChangeLog.claws

diff --git a/PATCHSETS b/PATCHSETS
index b1c95735d233b26974ad1532db857d162f04d705..e0e17f81fb8d53f7741c68c3f90624a9ef912e94 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -278,3 +278,4 @@
 ( cvs diff -u -r 1.382.2.78 -r 1.382.2.79 src/compose.c; ) > 0.9.12cvs183.1.patchset
 ( cvs diff -u -r 1.2504.2.36 -r 1.2504.2.37 ChangeLog.claws; cvs diff -u -r 1.29.2.3 -r 1.29.2.4 INSTALL; cvs diff -u -r 1.24.2.4 -r 1.24.2.5 Makefile.am; cvs diff -u -r 1.37.2.1 -r 1.37.2.2 README.claws; cvs diff -u -r -1.29.2.1 -r -1.29.2.2 TODO.claws; cvs diff -u -r 1.654.2.310 -r 1.654.2.311 configure.ac; cvs diff -u -r 1.21.2.1 -r 1.21.2.2 po/bg.po; cvs diff -u -r 1.9.2.1 -r 1.9.2.2 po/cs.po; cvs diff -u -r 1.9.2.1 -r 1.9.2.2 po/el.po; cvs diff -u -r 1.12.2.2 -r 1.12.2.3 po/en_GB.po; cvs diff -u -r 1.60.2.5 -r 1.60.2.6 po/es.po; cvs diff -u -r 1.42.2.5 -r 1.42.2.6 po/fr.po; cvs diff -u -r 1.7.2.2 -r 1.7.2.3 po/hr.po; cvs diff -u -r 1.5.2.1 -r 1.5.2.2 po/hu.po; cvs diff -u -r 1.34.2.4 -r 1.34.2.5 po/it.po; cvs diff -u -r 1.16.2.3 -r 1.16.2.4 po/ja.po; cvs diff -u -r 1.8.2.1 -r 1.8.2.2 po/ko.po; cvs diff -u -r 1.28.2.1 -r 1.28.2.2 po/nl.po; cvs diff -u -r 1.10.2.5 -r 1.10.2.6 po/pl.po; cvs diff -u -r 1.50.2.3 -r 1.50.2.4 po/pt_BR.po; cvs diff -u -r 1.17.2.2 -r 1.17.2.3 po/ru.po; cvs diff -u -r 1.2.2.5 -r 1.2.2.6 po/sk.po; cvs diff -u -r 1.17.2.5 -r 1.17.2.6 po/sr.po; cvs diff -u -r 1.4.2.1 -r 1.4.2.2 po/sv.po; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 po/zh_CN.po; cvs diff -u -r 1.11.2.1 -r 1.11.2.2 po/zh_TW.Big5.po; cvs diff -u -r 1.382.2.79 -r 1.382.2.80 src/compose.c; cvs diff -u -r 1.25.2.3 -r 1.25.2.4 tools/Makefile.am; cvs diff -u -r 1.30.2.2 -r 1.30.2.3 tools/README; cvs diff -u -r 1.16 -r 1.17 tools/filter_conv.pl; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 tools/kdeservicemenu/README; cvs diff -u -r 1.3.2.3 -r 1.3.2.4 tools/kdeservicemenu/template_sylpheed-attach-files.desktop; cvs diff -u -r 1.3.2.3 -r 1.3.2.4 tools/kdeservicemenu/template_sylpheed-compress-attach.desktop; ) > 0.9.12cvs187.1.patchset
 ( cvs diff -u -r 1.2504.2.37 -r 1.2504.2.38 ChangeLog.claws; cvs diff -u -r 1.100.2.6 -r 1.100.2.7 AUTHORS; cvs diff -u -r 1.2.2.6 -r 1.2.2.7 po/sk.po; cvs diff -u -r 1.49.2.25 -r 1.49.2.26 src/procmime.c; cvs diff -u -r 1.105.2.14 -r 1.105.2.15 src/prefs_account.c; cvs diff -u -r 1.11.2.6 -r 1.11.2.7 src/common/smtp.c; cvs diff -u -r 1.6.2.3 -r 1.6.2.4 src/common/smtp.h; ) > 0.9.13cvs2.1.patchset
+( cvs diff -u -r 1.49.2.26 -r 1.49.2.27 src/procmime.c; ) > 0.9.13cvs2.2.patchset

diff --git a/configure.ac b/configure.ac
index 3a9d0754c42fcdd963b85470e97f480547de10e3..1c46316d7ee19d64f8c4054192f4ba529c462c2d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=2
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2
 
 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/procmime.c b/src/procmime.c
index 00889639131d554c87c7d313c628e4c1e1ac98e4..f38885d51fe9225d23cac94a080368c588a603ba 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -856,26 +856,24 @@ gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
        g_snprintf(f_prefix, sizeof(f_prefix), "%08x.", id++);
 
        if ((mimeinfo->type == MIMETYPE_TEXT) && !g_ascii_strcasecmp(mimeinfo->subtype, "html"))
-               base = "mimetmp.html";
+               base = g_strdup("mimetmp.html");
        else {
                const gchar *basetmp;
-               gchar *basename;
 
                basetmp = procmime_mimeinfo_get_parameter(mimeinfo, "filename");
                if (basetmp == NULL)
                        basetmp = procmime_mimeinfo_get_parameter(mimeinfo, "name");
                if (basetmp == NULL)
                        basetmp = "mimetmp";
-               basename = g_path_get_basename(basetmp);
-               if (*basename == '\0') basename = g_strdup("mimetmp");
-               Xstrdup_a(base, basename, {g_free(basename); return NULL;});
+               base = g_path_get_basename(basetmp);
+               if (*base == '\0') base = g_strdup("mimetmp");
                subst_for_shellsafe_filename(base);
-               g_free(basename);
        }
 
        filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
                               f_prefix, base, NULL);
 
+       g_free(base);
        return filename;
 }