win32: don't uncanonicalize text files when decoding.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@775 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 14 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 12214baa..6ad9141a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-11-24
 
+	* libsylph/procmime.c: procmime_decode_content(): win32: don't
+	  uncanonicalize text files.
+
+2005-11-24
+
 	* libsylph/pop.c
 	  libsylph/session.[ch]: implemented session_recv_data_as_file(),
 	  which receives data as file stream, to reduce memory usage on POP3
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 1fd49b0c..f7db97ee 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2005-11-24
 
+	* libsylph/procmime.c: procmime_decode_content(): win32: テキスト
+	  ファイルを非正規化しないようにした。
+
+2005-11-24
+
 	* libsylph/pop.c
 	  libsylph/session.[ch]: POP3 セッションでのメモリ消費量を削減する
 	  ために、データをファイルストリームとして受信する
diff --git a/libsylph/procmime.c b/libsylph/procmime.c
index da7e8b1f..91500972 100644
--- a/libsylph/procmime.c
+++ b/libsylph/procmime.c
@@ -575,6 +575,7 @@ FILE *procmime_decode_content(FILE *outfp, FILE *infp, MimeInfo *mimeinfo)
 		Base64Decoder *decoder;
 		gboolean uncanonicalize = FALSE;
 		FILE *tmpfp = outfp;
+#ifndef G_OS_WIN32
 		ContentType content_type;
 
 		content_type = procmime_scan_mime_type(mimeinfo->content_type);
@@ -589,6 +590,7 @@ FILE *procmime_decode_content(FILE *outfp, FILE *infp, MimeInfo *mimeinfo)
 				return NULL;
 			}
 		}
+#endif
 
 		decoder = base64_decoder_new();
 		while (fgets(buf, sizeof(buf), infp) != NULL &&
@@ -604,6 +606,7 @@ FILE *procmime_decode_content(FILE *outfp, FILE *infp, MimeInfo *mimeinfo)
 		}
 		base64_decoder_free(decoder);
 
+#ifndef G_OS_WIN32
 		if (uncanonicalize) {
 			rewind(tmpfp);
 			while (fgets(buf, sizeof(buf), tmpfp) != NULL) {
@@ -612,6 +615,7 @@ FILE *procmime_decode_content(FILE *outfp, FILE *infp, MimeInfo *mimeinfo)
 			}
 			fclose(tmpfp);
 		}
+#endif
 	} else if (mimeinfo->encoding_type == ENC_X_UUENCODE) {
 		gchar outbuf[BUFFSIZE];
 		gint len;