+2005-08-27 [colin] 1.9.13cvs66
+
+ * src/imap.c
+ * src/procmime.c
+ Correctly fix "Problem with replies", fixes
+ pgpmime encryption too. pgpinline seems to
+ have a problem
+
2005-08-27 [colin] 1.9.13cvs65
* src/folder.c
( cvs diff -u -r 1.179.2.60 -r 1.179.2.61 src/imap.c; cvs diff -u -r 1.1.4.17 -r 1.1.4.18 src/etpan/imap-thread.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/etpan/imap-thread.h; cvs diff -u -r 1.1 -r 1.2 src/gtk/.cvsignore; ) > 1.9.13cvs63.patchset
( cvs diff -u -r 1.25.2.5 -r 1.25.2.6 tools/Makefile.am; diff -u /dev/null tools/asus_mailled.sh; ) > 1.9.13cvs64.patchset
( cvs diff -u -r 1.213.2.53 -r 1.213.2.54 src/folder.c; cvs diff -u -r 1.150.2.41 -r 1.150.2.42 src/procmsg.c; cvs diff -u -r 1.60.2.15 -r 1.60.2.16 src/procmsg.h; cvs diff -u -r 1.395.2.116 -r 1.395.2.117 src/summaryview.c; ) > 1.9.13cvs65.patchset
+( cvs diff -u -r 1.179.2.61 -r 1.179.2.62 src/imap.c; cvs diff -u -r 1.49.2.57 -r 1.49.2.58 src/procmime.c; ) > 1.9.13cvs66.patchset
return cnt;
}
+static void strip_crs(const gchar *file)
+{
+ FILE *fp = NULL, *outfp = NULL;
+ gchar buf[4096];
+ gchar *out = get_tmp_file();
+ if (file == NULL)
+ return;
+
+ fp = fopen(file, "rb");
+ if (!fp)
+ return;
+
+ outfp = fopen(out, "wb");
+ if (!outfp)
+ return;
+
+ while (fgets(buf, sizeof (buf), fp) != NULL) {
+ while (strstr(buf, "\r")) {
+ gchar *cr = strstr(buf, "\r") ;
+ *cr = '\n';
+ cr++;
+ *cr = '\0';
+ }
+ fputs(buf, outfp);
+ }
+
+ fclose(fp);
+ fclose(outfp);
+ rename_force(out, file);
+}
+
static gchar *imap_fetch_msg_full(Folder *folder, FolderItem *item, gint uid,
gboolean headers, gboolean body)
{
if (cached && (cached->size == have_size || !body)) {
procmsg_msginfo_free(cached);
procmsg_msginfo_free(msginfo);
+ strip_crs(filename);
return filename;
} else {
procmsg_msginfo_free(cached);
return NULL;
}
+ strip_crs(filename);
return filename;
}
switch (mimeinfo->type) {
case MIMETYPE_MESSAGE:
if (g_ascii_strcasecmp(mimeinfo->subtype, "rfc822") == 0) {
- if (mimeinfo->encoding_type == ENC_UNKNOWN
- && mimeinfo->content != MIMECONTENT_EMPTY)
- procmime_encode_content(mimeinfo, ENC_BINARY);
-
return procmime_write_message_rfc822(mimeinfo, fp);
}
break;