merge a lot of work. Rough ChangeLog will follow

svn path=/trunk/; revision=1052

1 files changed, 7 insertions, 5 deletions

diff --git a/tests/test2.c b/tests/test2.c
index 03f03a105c..154a243007 100644
--- a/tests/test2.c
+++ b/tests/test2.c
@@ -7,6 +7,7 @@
 #include "camel-mime-part.h"
 #include "camel-stream.h"
 #include "camel-stream-fs.h"
+#include "camel.h"
 
 void
 main (int argc, char**argv)
@@ -16,22 +17,23 @@ main (int argc, char**argv)
 	CamelStream *input_stream, *output_stream;
 	
 	gtk_init (&argc, &argv);
-	camel_debug_level = FULL_DEBUG;
+	camel_init ();
+	camel_debug_level = CAMEL_LOG_LEVEL_FULL_DEBUG;
 	message = camel_mime_message_new_with_session( (CamelSession *)NULL);
 
 	
-	input_stream = camel_stream_fs_new_with_name (g_string_new ("mail.test"), CAMEL_STREAM_FS_READ);
+	input_stream = camel_stream_fs_new_with_name ("mail.test", CAMEL_STREAM_FS_READ);
 	if (!input_stream) {
-		perror("could not open input file");
+		perror ("could not open input file");
+		printf ("You must create the file mail.test before running this test");
 		exit(2);
 	}
 	
-
 	camel_data_wrapper_construct_from_stream ( CAMEL_DATA_WRAPPER (message), input_stream);
 					     
 	camel_stream_close (input_stream);
 
-	output_stream = camel_stream_fs_new_with_name (g_string_new ("mail2.test"), CAMEL_STREAM_FS_WRITE);
+	output_stream = camel_stream_fs_new_with_name ("mail2.test", CAMEL_STREAM_FS_WRITE);
 	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), output_stream);
 	camel_stream_close (output_stream);