diff src/readpst.c @ 236:093e0e9248bb stable-0-6-43

cleanup rfc822 embedded message code
author Carl Byington <carl@five-ten-sg.com>
date Sat, 12 Sep 2009 11:44:08 -0700
parents ed0cb66b23d4
children 410b6422d65b
line wrap: on
line diff
--- a/src/readpst.c	Fri Sep 11 12:59:24 2009 -0700
+++ b/src/readpst.c	Sat Sep 12 11:44:08 2009 -0700
@@ -1575,18 +1575,13 @@
             pst_convert_utf8_null(item, &attach->mimetype);
             DEBUG_INFO(("Attempting Attachment encoding\n"));
             if (attach->method == PST_ATTACH_EMBEDDED) {
-                DEBUG_INFO(("seem to have special embedded message attachment\n"));
-                char *m = NULL;
+                DEBUG_INFO(("have an embedded rfc822 message attachment\n"));
                 if (attach->mimetype.str) {
-                    DEBUG_INFO(("already has a mime-type of %s\n", attach->mimetype.str));
+                    DEBUG_INFO(("which already has a mime-type of %s\n", attach->mimetype.str));
                     free(attach->mimetype.str);
                 }
                 attach->mimetype.str = strdup(RFC822);
                 attach->mimetype.is_utf8 = 1;
-                write_embedded_message(f_output, attach, boundary, pst, &m);
-            }
-            else if (!attach->data.data && attach->mimetype.str && !strcmp(attach->mimetype.str, RFC822)) {
-                DEBUG_INFO(("seem to have embedded message attachment\n"));
                 find_rfc822_headers(extra_mime_headers);
                 write_embedded_message(f_output, attach, boundary, pst, extra_mime_headers);
             }