Mercurial > libpst

comparison src/readpst.c @ 255:ab87f9070ed2 stable-0-6-49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix to ignore embedded objects that are not email messages
author Carl Byington <carl@five-ten-sg.com>
date Mon, 13 Sep 2010 14:47:09 -0700
parents fb66d428347d
children c947b8812120
comparison
equal deleted inserted replaced
254:fb66d428347d 255:ab87f9070ed2
1010 // a reference to an internal Outlook COM class. 1010 // a reference to an internal Outlook COM class.
1011 // Log the skipped item and continue on. 1011 // Log the skipped item and continue on.
1012 if (!item) { 1012 if (!item) {
1013 DEBUG_WARN(("write_embedded_message: pst_parse_item was unable to parse the embedded message in attachment ID %llu", attach->i_id)); 1013 DEBUG_WARN(("write_embedded_message: pst_parse_item was unable to parse the embedded message in attachment ID %llu", attach->i_id));
1014 } else { 1014 } else {
1015 fprintf(f_output, "\n--%s\n", boundary); 1015 if (!item->email) {
1016 fprintf(f_output, "Content-Type: %s\n\n", attach->mimetype.str); 1016 DEBUG_WARN(("write_embedded_message: pst_parse_item returned type %d, not an email message", item->type));
1017 write_normal_email(f_output, "", item, MODE_NORMAL, 0, pf, 0, extra_mime_headers); 1017 } else {
1018 fprintf(f_output, "\n--%s\n", boundary);
1019 fprintf(f_output, "Content-Type: %s\n\n", attach->mimetype.str);
1020 write_normal_email(f_output, "", item, MODE_NORMAL, 0, pf, 0, extra_mime_headers);
1021 }
1018 pst_freeItem(item); 1022 pst_freeItem(item);
1019 } 1023 }
1020 1024
1021 DEBUG_RET(); 1025 DEBUG_RET();
1022 } 1026 }