2005-01-01 [colin] 0.9.13cvs24.1

	* src/procmime.c
		Sync with HEAD (leak fix)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index debbe4f9db6879c003298ffa8aacd9e04c500c34..5bd84c3e9e71ed938dba685f2b71d0f956482d40 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-01-01 [colin]     0.9.13cvs24.1
+
+       * src/procmime.c
+               Sync with HEAD (leak fix)
+
 2004-12-31 [colin]     0.9.13cvs23.2
 
        * src/prefs_common.c

diff --git a/PATCHSETS b/PATCHSETS
index 1be8fb4595ef3f3bff7b4969ddcaa6bc8eda9aea..60fa08f789ca757525659ca646c3192092e117a7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -297,3 +297,4 @@
 ( cvs diff -u -r 1.61.2.17 -r 1.61.2.18 src/account.c; cvs diff -u -r 1.12.2.17 -r 1.12.2.18 src/action.c; cvs diff -u -r 1.8.2.3 -r 1.8.2.4 src/export.c; cvs diff -u -r 1.26.2.7 -r 1.26.2.8 src/foldersel.c; cvs diff -u -r 1.13.2.4 -r 1.13.2.5 src/import.c; cvs diff -u -r 1.3.12.5 -r 1.3.12.6 src/message_search.c; cvs diff -u -r 1.60.2.6 -r 1.60.2.7 src/prefs_actions.c; cvs diff -u -r 1.204.2.25 -r 1.204.2.26 src/prefs_common.c; cvs diff -u -r 1.16.2.5 -r 1.16.2.6 src/prefs_customheader.c; cvs diff -u -r 1.59.2.11 -r 1.59.2.12 src/prefs_filtering.c; cvs diff -u -r 1.10.2.3 -r 1.10.2.4 src/prefs_summary_column.c; cvs diff -u -r 1.15.2.11 -r 1.15.2.12 src/summary_search.c; cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/gtk/about.c; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/gtk/description_window.c; cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/gtk/gtkutils.h; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/gtk/inputdialog.c; cvs diff -u -r 1.12.2.12 -r 1.12.2.13 src/gtk/prefswindow.c; ) > 0.9.13cvs22.4.patchset
 ( cvs diff -u -r 1.654.2.330 -r 1.654.2.331 configure.ac; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/gtk/pluginwindow.c; ) > 0.9.13cvs23.1.patchset
 ( cvs diff -u -r 1.204.2.26 -r 1.204.2.27 src/prefs_common.c; ) > 0.9.13cvs23.2.patchset
+( cvs diff -u -r 1.49.2.28 -r 1.49.2.29 src/procmime.c; ) > 0.9.13cvs24.1.patchset

diff --git a/configure.ac b/configure.ac
index 9b955554d4ce02a064de7d37f4b3747e45bf30fc..b8704fd8e73b8a9fb991ae8e6b7d840ab920a009 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=23
+EXTRA_VERSION=24
 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/procmime.c b/src/procmime.c
index d7bc83382ac3158fecfe50cb121d95ba2e791049..4e7cfa42d44aa13a8047fb8d9023fbc1bed13de9 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1243,6 +1243,7 @@ void procmime_parse_message_rfc822(MimeInfo *mimeinfo)
                MimeInfo *subinfo;
 
                subinfo = procmime_mimeinfo_new();
+               subinfo->content = MIMECONTENT_FILE;
                subinfo->encoding_type = ENC_UNKNOWN;
                subinfo->type = MIMETYPE_TEXT;
                subinfo->subtype = g_strdup("plain");