Took out the filter code ( we already filter in

* providers/pop3/camel-pop3-folder.c (get_message_by_uid): Took out the
	filter code ( we already filter in camel_pop3_command_get_additional_data)

svn path=/trunk/; revision=3560

2 files changed, 5 insertions, 12 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 522b9d887b..964eab8fb6 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,8 @@
 2000-06-14  Jeffrey Stedfast  <fejj@helixcode.com>
 
+	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): Took out the
+	filter code ( we already filter in camel_pop3_command_get_additional_data)
+
 	* camel-folder.c (init): Updated: a separator is now a char* rather than
 	a single char because IMAP can have a string for a directory separator.
 	Also, since IMAP does not begin with a directory separator, there is a new
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 247635da2a..c24157d168 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -29,7 +29,6 @@
 #include "camel-stream-mem.h"
 #include "camel-stream-filter.h"
 #include "camel-mime-message.h"
-#include "camel-mime-filter-crlf.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -142,12 +141,10 @@ pop3_close (CamelFolder *folder, gboolean expunge, CamelException *ex)
 static CamelMimeMessage *
 get_message_by_uid (CamelFolder *folder, const char *uid, CamelException *ex)
 {
-	int status, id;
+	int status;
 	char *result, *body;
 	CamelStream *msgstream;
-	CamelStreamFilter *f_stream;
 	CamelMimeMessage *msg;
-	CamelMimeFilter *filter;
 
 	status = camel_pop3_command (CAMEL_POP3_STORE (folder->parent_store),
 				     &result, "RETR %d", atoi (uid));
@@ -175,18 +172,11 @@ get_message_by_uid (CamelFolder *folder, const char *uid, CamelException *ex)
 
 	msgstream = camel_stream_mem_new_with_buffer (body, strlen (body));
 	g_free (body);
-
-	f_stream = camel_stream_filter_new_with_stream (msgstream);
-	filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_DECODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS);
-	id = camel_stream_filter_add (f_stream, CAMEL_MIME_FILTER (filter));
 	
 	msg = camel_mime_message_new ();
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg), CAMEL_STREAM (f_stream));
+	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg), CAMEL_STREAM (msgstream));
 
-	camel_stream_filter_remove (f_stream, id);
-	camel_stream_close (CAMEL_STREAM (f_stream));
 	gtk_object_unref (GTK_OBJECT (msgstream));
-	gtk_object_unref (GTK_OBJECT (f_stream));
 
 	return msg;
 }