2007-07-26 [colin] 2.10.0cvs69

	* src/procmime.c
		Fix unwanted output

diff --git a/ChangeLog b/ChangeLog
index 3b8277e07fe07536267eae11d82b09beea57f314..6930d7c2d96d22d08aac7dd849759041b3f22346 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-26 [colin]     2.10.0cvs69
+
+       * src/procmime.c
+               Fix unwanted output
+
 2007-07-26 [colin]     2.10.0cvs68
 
        * src/ldapserver.c

diff --git a/PATCHSETS b/PATCHSETS
index 6c804e2db2e15e919a81b6192c5f4ce0c4d3cbff..92d98e4b07bb3a42c48355c6670c70dba25e1af0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2722,3 +2722,4 @@
 ( cvs diff -u -r 1.12.2.38 -r 1.12.2.39 src/gtk/prefswindow.c;  ) > 2.10.0cvs66.patchset
 ( cvs diff -u -r 1.83.2.113 -r 1.83.2.114 src/mimeview.c;  cvs diff -u -r 1.75.2.43 -r 1.75.2.44 src/matcher.c;  cvs diff -u -r 1.9.2.20 -r 1.9.2.21 src/common/ssl.c;  ) > 2.10.0cvs67.patchset
 ( cvs diff -u -r 1.382.2.395 -r 1.382.2.396 src/compose.c;  cvs diff -u -r 1.4.2.10 -r 1.4.2.11 src/ldapserver.c;  cvs diff -u -r 1.49.2.93 -r 1.49.2.94 src/procmime.c;  cvs diff -u -r 1.17.2.18 -r 1.17.2.19 src/procmime.h;  cvs diff -u -r 1.22.2.34 -r 1.22.2.35 src/quote_fmt_parse.y;  ) > 2.10.0cvs68.patchset
+( cvs diff -u -r 1.49.2.94 -r 1.49.2.95 src/procmime.c;  ) > 2.10.0cvs69.patchset

diff --git a/configure.ac b/configure.ac
index 5ebfdc4e7712ae71d313fe07593615ce4b451885..968db04def4cf8d1c1251e5a8cd8ba1f2296c6d6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=68
+EXTRA_VERSION=69
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/procmime.c b/src/procmime.c
index c8ac29cbfe61014e769b13638866849a55ab4c8f..01c951a9a1f3c1241d960e7de6aee1a8fd8ac479 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -838,7 +838,6 @@ FILE *procmime_get_text_content(MimeInfo *mimeinfo)
        return outfp;
 }
 
-static void output_mime_structure(MimeInfo *mimeinfo, int indent);
 /* search the first text part of (multipart) MIME message,
    decode, convert it and output to outfp. */
 FILE *procmime_get_first_text_content(MsgInfo *msginfo)
@@ -851,8 +850,6 @@ FILE *procmime_get_first_text_content(MsgInfo *msginfo)
        mimeinfo = procmime_scan_message_short(msginfo);
        if (!mimeinfo) return NULL;
 
-output_mime_structure(mimeinfo, 0);
-
        partinfo = mimeinfo;
        while (partinfo && partinfo->type != MIMETYPE_TEXT) {
                partinfo = procmime_mimeinfo_next(partinfo);