Here is my initial Evolution work: message composition widget and some

installation fixes for Camel.

svn path=/trunk/; revision=1369

12 files changed, 30 insertions, 26 deletions

diff --git a/camel/Makefile.am b/camel/Makefile.am
index b9316d1fca..0f5a4227b2 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -98,6 +98,7 @@ libcamelinclude_HEADERS =			\
 	md5-utils.h				\
 	string-utils.h				\
 	url-util.h				\
+	camel-exception-list.def		\
 	$(pthread_HDR)
 
 libcamel_extra_sources = \
@@ -106,4 +107,4 @@ libcamel_extra_sources = \
 libcamel_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
 
 
-EXTRA_DIST = README camel-exception-list.def
+EXTRA_DIST = README 
diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
index bc98f85c7e..2f56ed2000 100644
--- a/camel/camel-data-wrapper.h
+++ b/camel/camel-data-wrapper.h
@@ -79,7 +79,7 @@ GtkType camel_data_wrapper_get_type (void);
 void camel_data_wrapper_write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
 void camel_data_wrapper_construct_from_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);
 void camel_data_wrapper_set_mime_type (CamelDataWrapper *data_wrapper, gchar *mime_type);
-static gchar *camel_data_wrapper_get_mime_type (CamelDataWrapper *data_wrapper);
+gchar *camel_data_wrapper_get_mime_type (CamelDataWrapper *data_wrapper);
 GMimeContentField *camel_data_wrapper_get_mime_type_field (CamelDataWrapper *data_wrapper);
 void camel_data_wrapper_set_mime_type_field (CamelDataWrapper *data_wrapper, GMimeContentField *mime_type);
 
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index d890ffd69d..cacfa318e0 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -1128,8 +1128,8 @@ _get_message_uid_by_number (CamelFolder *folder, gint message_number, CamelExcep
 const gchar * 
 camel_folder_get_message_uid_by_number (CamelFolder *folder, gint message_number, CamelException *ex)
 {
-	//if (!folder->has_uid_capability) return NULL;
-	//return CF_CLASS (folder)->get_message_uid_by_number (folder, message_number, ex);
+	/*  if (!folder->has_uid_capability) return NULL; */
+	/*  return CF_CLASS (folder)->get_message_uid_by_number (folder, message_number, ex); */
 }
 
 
diff --git a/camel/camel-medium.c b/camel/camel-medium.c
index d26b64a246..01aa440f84 100644
--- a/camel/camel-medium.c
+++ b/camel/camel-medium.c
@@ -67,11 +67,9 @@ camel_medium_class_init (CamelMediumClass *camel_medium_class)
 	camel_medium_class->set_content_object = _set_content_object;
 	camel_medium_class->get_content_object = _get_content_object;
 	
-	
-	
 	/* virtual method overload */
-	//	camel_data_wrapper_class->write_to_stream = _write_to_stream;
-	//camel_data_wrapper_class->construct_from_stream = _construct_from_stream;
+	/* camel_data_wrapper_class->write_to_stream = _write_to_stream; */
+	/* camel_data_wrapper_class->construct_from_stream = _construct_from_stream; */
 
 	gtk_object_class->finalize = _finalize;
 }
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index 71a4c80643..180a843c02 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -628,10 +628,13 @@ _write_content_to_stream (CamelMimePart *mime_part, CamelStream *stream)
 	CAMEL_LOG_FULL_DEBUG ( "Entering CamelMimePart::_write_content_to_stream\n");
 	CAMEL_LOG_FULL_DEBUG ( "CamelMimePart::_write_content_to_stream, content=%p\n", content);
 	if (!content) return;
-	//	buffer_size = camel_data_wrapper_size (content);
-	//buffer = g_malloc (buffer_size);
+
+	/* buffer_size = camel_data_wrapper_size (content); */
+	/* buffer = g_malloc (buffer_size); */
+
 	camel_data_wrapper_write_to_stream (content, stream);
-	
+
+#if 0
 	//if (mime_part->encoding) {
 		// encoded_buffer_size = gmime_encoded_size(buffer, buffer_size, encoding);
 		// encoded_buffer = g_malloc (encoded_buffer_size);
@@ -642,6 +645,8 @@ _write_content_to_stream (CamelMimePart *mime_part, CamelStream *stream)
 		//fwrite (buffer, buffer_size, 1, file);
 		//camel_stream_write (stream, buffer, buffer_size);
 	//g_free (buffer);
+#endif
+
 	CAMEL_LOG_FULL_DEBUG ( "Leaving CamelMimePart::_write_content_to_stream\n");
 }
 
diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c
index 7df44b6cb2..f3128be9e7 100644
--- a/camel/camel-multipart.c
+++ b/camel/camel-multipart.c
@@ -474,7 +474,8 @@ _construct_from_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 	CAMEL_LOG_FULL_DEBUG ("CamelMultipart::construct_from_stream freeing new_part_stream:%p\n", new_part_stream);
 	gtk_object_unref (GTK_OBJECT (new_part_stream));
 	if (multipart->preface) g_free (multipart->preface);
-	//if ( (new_part->str)[0] != '\0') multipart->preface = g_strdup (new_part->str);
+
+	/* if ( (new_part->str)[0] != '\0') multipart->preface = g_strdup (new_part->str); */
 	
 	/* read all the real parts */
 	while (!end_of_multipart) {
@@ -490,12 +491,14 @@ _construct_from_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 		
 	}
 
-	//g_string_assign (new_part, "");
-	//_read_part (new_part, stream, real_boundary_line, end_boundary_line);
+	/* g_string_assign (new_part, ""); */
+	/* _read_part (new_part, stream, real_boundary_line, end_boundary_line); */
+
 	if (multipart->postface) g_free (multipart->postface);
-	//if ( (new_part->str)[0] != '\0') multipart->postface = g_strdup (new_part->str);
+	/* if ( (new_part->str)[0] != '\0') multipart->postface = g_strdup (new_part->str); */
+
+	/* g_string_free (new_part, TRUE); */
 
-	//g_string_free (new_part, TRUE);
 	g_free (real_boundary_line);
 	g_free (end_boundary_line);
 	CAMEL_LOG_FULL_DEBUG ("Leaving CamelMultipart::_construct_from_stream\n");
diff --git a/camel/camel-provider.c b/camel/camel-provider.c
index 362ad087bc..7664838975 100644
--- a/camel/camel-provider.c
+++ b/camel/camel-provider.c
@@ -72,15 +72,14 @@ camel_provider_register (CamelProvider *provider)
 		old_provider_node = g_list_find_custom (_provider_list, provider, _provider_name_cmp);
 
 	if (old_provider_node != NULL) {
-		// camel_provider_unref (CAMEL_PROVIDER (old_provider_node->data));
+		/* camel_provider_unref (CAMEL_PROVIDER (old_provider_node->data)); */
 		old_provider_node->data = provider;
 	} else {
 		/* be careful, we use prepend here, so that last registered
 		   providers come first */
 		_provider_list = g_list_prepend (_provider_list, provider);
 	}
-	// camel_provider_ref (provider);
-	
+	/* camel_provider_ref (provider); */
 }
 
 
diff --git a/camel/camel.c b/camel/camel.c
index 51bf4ca8ee..68d0a54407 100644
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -35,6 +35,5 @@ camel_init()
 	printf ("Threads are not supported by glib\n");
 #endif /* G_THREADS_ENABLED */
 
-	//return data_wrapper_repository_init ();
-	
+	/* return data_wrapper_repository_init (); */
 }
diff --git a/camel/camel.h b/camel/camel.h
index 9a3898e055..b21ccf5e78 100644
--- a/camel/camel.h
+++ b/camel/camel.h
@@ -34,7 +34,6 @@ extern "C" {
 #endif /* __cplusplus }*/
 
 #include <gtk/gtk.h>
-#include <config.h>
 #include <camel/data-wrapper-repository.h>
 #include <camel/data-wrapper-repository.h>
 #include <camel/camel-log.h>	
diff --git a/camel/data-wrapper-repository.h b/camel/data-wrapper-repository.h
index 8999467175..27f782878a 100644
--- a/camel/data-wrapper-repository.h
+++ b/camel/data-wrapper-repository.h
@@ -34,7 +34,6 @@ extern "C" {
 #endif /* __cplusplus }*/
 
 #include <glib.h>
-#include <config.h>
 #include "camel-data-wrapper.h"
 
 
diff --git a/camel/gmime-content-field.c b/camel/gmime-content-field.c
index 79d4d1bdca..43691f0d62 100644
--- a/camel/gmime-content-field.c
+++ b/camel/gmime-content-field.c
@@ -261,7 +261,7 @@ gmime_content_field_get_parameter (GMimeContentField *content_field, const gchar
 	g_assert (content_field->parameters);
 	g_assert (name);
 	CAMEL_LOG_FULL_DEBUG ("GMimeContentField::get_parameter looking for parameter \"%s\"\n", name);
-	//parameter = (const gchar *)g_hash_table_lookup (content_field->parameters, name);
+	/* parameter = (const gchar *)g_hash_table_lookup (content_field->parameters, name); */
 	parameter_exists = g_hash_table_lookup_extended (content_field->parameters, 
 							 name, 
 							 (gpointer *) &old_name,
diff --git a/camel/gmime-rfc2047.c b/camel/gmime-rfc2047.c
index 587c654d9f..7da12450b6 100644
--- a/camel/gmime-rfc2047.c
+++ b/camel/gmime-rfc2047.c
@@ -240,8 +240,9 @@ gmime_rfc2047_decode (const gchar *data, const gchar *into_what)
 #define isnt_ascii(a) ((a) <= 0x1f || (a) >= 0x7f)
 
 static int 
-rfc2047_clean (const gchar *string, const gchar *max) {
-	//	if (strstr (string, "?=")) return 1;
+rfc2047_clean (const gchar *string, const gchar *max)
+{
+	/* if (strstr (string, "?=")) return 1; */
 	while (string < max) {
 		if (isnt_ascii ((unsigned char)*string))
 			return 0;