static functions naming follows gnome coding style guide.

1999-05-11  bertrand  <Bertrand.Guiheneuf@inria.fr>

	* camel/camel-store.c:
	* camel/camel-service.c:
	* camel/camel-folder.c:
	* camel/camel-data-wrapper.c:
	* camel/camel-mime-part.c:
	static functions naming follows gnome
	coding style guide.

svn path=/trunk/; revision=902

6 files changed, 188 insertions, 186 deletions

diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c
index 9020b7e8fc..8933546167 100644
--- a/camel/camel-data-wrapper.c
+++ b/camel/camel-data-wrapper.c
@@ -31,10 +31,10 @@ static GtkObjectClass *parent_class=NULL;
 /* Returns the class for a CamelDataWrapper */
 #define CDH_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (GTK_OBJECT(so)->klass)
 
-static void __camel_data_wrapper_write_to_buffer(CamelDataWrapper *data_wrapper, gchar *buffer);
-static void __camel_data_wrapper_write_to_file(CamelDataWrapper *data_wrapper, FILE *file);
-static void __camel_data_wrapper_construct_from_buffer(CamelDataWrapper *data_wrapper, gchar *buffer, guint size);
-static void __camel_data_wrapper_construct_from_file (CamelDataWrapper *data_wrapper, FILE *file, guint size);
+static void _write_to_buffer(CamelDataWrapper *data_wrapper, gchar *buffer);
+static void _write_to_file(CamelDataWrapper *data_wrapper, FILE *file);
+static void _construct_from_buffer(CamelDataWrapper *data_wrapper, gchar *buffer, guint size);
+static void _construct_from_file (CamelDataWrapper *data_wrapper, FILE *file, guint size);
 
 static void
 camel_data_wrapper_class_init (CamelDataWrapperClass *camel_data_wrapper_class)
@@ -42,10 +42,10 @@ camel_data_wrapper_class_init (CamelDataWrapperClass *camel_data_wrapper_class)
 	parent_class = gtk_type_class (gtk_object_get_type ());
 	
 	/* virtual method definition */
-	camel_data_wrapper_class->write_to_buffer = __camel_data_wrapper_write_to_buffer;
-	camel_data_wrapper_class->write_to_file = __camel_data_wrapper_write_to_file;
-	camel_data_wrapper_class->construct_from_buffer = __camel_data_wrapper_construct_from_buffer;
-	camel_data_wrapper_class->construct_from_file = __camel_data_wrapper_construct_from_file;
+	camel_data_wrapper_class->write_to_buffer = _write_to_buffer;
+	camel_data_wrapper_class->write_to_file = _write_to_file;
+	camel_data_wrapper_class->construct_from_buffer = _construct_from_buffer;
+	camel_data_wrapper_class->construct_from_file = _construct_from_file;
 
 	/* virtual method overload */
 }
@@ -84,7 +84,7 @@ camel_data_wrapper_get_type (void)
 
 
 /**
- * __camel_data_wrapper_write_to_buffer: write data content in a byte buffer
+ * _write_to_buffer: write data content in a byte buffer
  * @data_wrapper: the data wrapper object
  * @buffer: byte buffer where data will be written 
  * 
@@ -99,7 +99,7 @@ camel_data_wrapper_get_type (void)
  * 
  **/
 static void
-__camel_data_wrapper_write_to_buffer(CamelDataWrapper *data_wrapper, gchar *buffer)
+_write_to_buffer(CamelDataWrapper *data_wrapper, gchar *buffer)
 {
 	/* nothing */
 }
@@ -123,7 +123,7 @@ camel_data_wrapper_write_to_buffer(CamelDataWrapper *data_wrapper, gchar *buffer
 
 
 static void
-__camel_data_wrapper_write_to_file(CamelDataWrapper *data_wrapper, FILE *file)
+_write_to_file(CamelDataWrapper *data_wrapper, FILE *file)
 {
 	/* nothing */
 }
@@ -145,7 +145,7 @@ camel_data_wrapper_write_to_file(CamelDataWrapper *data_wrapper, FILE *file)
 
 
 static void
-__camel_data_wrapper_construct_from_buffer(CamelDataWrapper *data_wrapper, gchar *buffer, guint size)
+_construct_from_buffer(CamelDataWrapper *data_wrapper, gchar *buffer, guint size)
 {
 	/* nothing */
 }
@@ -159,7 +159,7 @@ camel_data_wrapper_construct_from_buffer(CamelDataWrapper *data_wrapper, gchar *
 
 
 static void
-__camel_data_wrapper_construct_from_file (CamelDataWrapper *data_wrapper, FILE *file, guint size)
+_construct_from_file (CamelDataWrapper *data_wrapper, FILE *file, guint size)
 {
 	/* nothing */
 }
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index e401a06dd0..09ba5a7fa9 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -29,26 +29,26 @@ static GtkObjectClass *parent_class=NULL;
 /* Returns the class for a CamelFolder */
 #define CF_CLASS(so) CAMEL_FOLDER_CLASS (GTK_OBJECT(so)->klass)
 
-static void __camel_folder_init_with_store (CamelFolder *folder, CamelStore *parent_store);
-static void __camel_folder_open (CamelFolder *folder, CamelFolderOpenMode mode);
-static void __camel_folder_close (CamelFolder *folder, gboolean expunge);
-static void __camel_folder_set_name (CamelFolder *folder, GString *name_);
-static void __camel_folder_set_full_name (CamelFolder *folder, GString *name);
-static GString *__camel_folder_get_name (CamelFolder *folder);
-static GString *__camel_folder_get_full_name (CamelFolder *folder);
-static gboolean __camel_folder_can_hold_folders (CamelFolder *folder);
-static gboolean __camel_folder_can_hold_messages(CamelFolder *folder);
-static gboolean __camel_folder_exists (CamelFolder  *folder);
-static gboolean __camel_folder_is_open (CamelFolder *folder);
-static CamelFolder *__camel_folder_get_folder (CamelFolder *folder, GString *folder_name);
-static gboolean __camel_folder_create (CamelFolder *folder);
-static gboolean __camel_folder_delete (CamelFolder *folder, gboolean recurse);
-static gboolean __camel_folder_delete_messages (CamelFolder *folder);
-static CamelFolder *__camel_folder_get_parent_folder (CamelFolder *folder);
-static CamelStore *__camel_folder_get_parent_store (CamelFolder *folder);
-static CamelFolderOpenMode __camel_folder_get_mode (CamelFolder *folder);
-static GList *__camel_folder_list_subfolders (CamelFolder *folder);
-static GList *__camel_folder_expunge (CamelFolder *folder);
+static void _init_with_store (CamelFolder *folder, CamelStore *parent_store);
+static void _open (CamelFolder *folder, CamelFolderOpenMode mode);
+static void _close (CamelFolder *folder, gboolean expunge);
+static void _set_name (CamelFolder *folder, GString *name_);
+static void _set_full_name (CamelFolder *folder, GString *name);
+static GString *_get_name (CamelFolder *folder);
+static GString *_get_full_name (CamelFolder *folder);
+static gboolean _can_hold_folders (CamelFolder *folder);
+static gboolean _can_hold_messages(CamelFolder *folder);
+static gboolean _exists (CamelFolder  *folder);
+static gboolean _is_open (CamelFolder *folder);
+static CamelFolder *_get_folder (CamelFolder *folder, GString *folder_name);
+static gboolean _create (CamelFolder *folder);
+static gboolean _delete (CamelFolder *folder, gboolean recurse);
+static gboolean _delete_messages (CamelFolder *folder);
+static CamelFolder *_get_parent_folder (CamelFolder *folder);
+static CamelStore *_get_parent_store (CamelFolder *folder);
+static CamelFolderOpenMode _get_mode (CamelFolder *folder);
+static GList *_list_subfolders (CamelFolder *folder);
+static GList *_expunge (CamelFolder *folder);
 
 static void
 camel_folder_class_init (CamelFolderClass *camel_folder_class)
@@ -56,24 +56,24 @@ camel_folder_class_init (CamelFolderClass *camel_folder_class)
 	parent_class = gtk_type_class (gtk_object_get_type ());
 	
 	/* virtual method definition */
-	camel_folder_class->init_with_store = __camel_folder_init_with_store;
-	camel_folder_class->open = __camel_folder_open;
-	camel_folder_class->close = __camel_folder_close;
-	camel_folder_class->set_name = __camel_folder_set_name;
-	camel_folder_class->get_name = __camel_folder_get_name;
-	camel_folder_class->can_hold_folders = __camel_folder_can_hold_folders;
-	camel_folder_class->can_hold_messages = __camel_folder_can_hold_messages;
-	camel_folder_class->exists = __camel_folder_exists;
-	camel_folder_class->is_open = __camel_folder_is_open;
-	camel_folder_class->get_folder = __camel_folder_get_folder;
-	camel_folder_class->create = __camel_folder_create;
-	camel_folder_class->delete = __camel_folder_delete;
-	camel_folder_class->delete_messages = __camel_folder_delete_messages;
-	camel_folder_class->get_parent_folder = __camel_folder_get_parent_folder;
-	camel_folder_class->get_parent_store = __camel_folder_get_parent_store;
-	camel_folder_class->get_mode = __camel_folder_get_mode;
-	camel_folder_class->list_subfolders = __camel_folder_list_subfolders;
-	camel_folder_class->expunge = __camel_folder_expunge;
+	camel_folder_class->init_with_store = _init_with_store;
+	camel_folder_class->open = _open;
+	camel_folder_class->close = _close;
+	camel_folder_class->set_name = _set_name;
+	camel_folder_class->get_name = _get_name;
+	camel_folder_class->can_hold_folders = _can_hold_folders;
+	camel_folder_class->can_hold_messages = _can_hold_messages;
+	camel_folder_class->exists = _exists;
+	camel_folder_class->is_open = _is_open;
+	camel_folder_class->get_folder = _get_folder;
+	camel_folder_class->create = _create;
+	camel_folder_class->delete = _delete;
+	camel_folder_class->delete_messages = _delete_messages;
+	camel_folder_class->get_parent_folder = _get_parent_folder;
+	camel_folder_class->get_parent_store = _get_parent_store;
+	camel_folder_class->get_mode = _get_mode;
+	camel_folder_class->list_subfolders = _list_subfolders;
+	camel_folder_class->expunge = _expunge;
 	/* virtual method overload */
 }
 
@@ -111,14 +111,14 @@ camel_folder_get_type (void)
 
 
 /**
- * __camel_folder_init_with_store: init the folder by setting its parent store.
+ * _init_with_store: init the folder by setting its parent store.
  * @folder: folder object to initialize
  * @parent_store: parent store object of the folder
  * 
  * 
  **/
 static void 
-__camel_folder_init_with_store(CamelFolder *folder, CamelStore *parent_store)
+_init_with_store(CamelFolder *folder, CamelStore *parent_store)
 {
 	g_assert(folder);
 	g_assert(parent_store);
@@ -130,13 +130,13 @@ __camel_folder_init_with_store(CamelFolder *folder, CamelStore *parent_store)
 
 
 /**
- * __camel_folder_open: Open a folder
+ * _open: Open a folder
  * @folder: 
  * @mode: open mode (R/W/RW ?)
  * 
  **/
 static void
-__camel_folder_open(CamelFolder *folder, CamelFolderOpenMode mode)
+_open(CamelFolder *folder, CamelFolderOpenMode mode)
 {
 	folder->open_state = FOLDER_OPEN;
 	folder->open_mode = mode;
@@ -144,7 +144,7 @@ __camel_folder_open(CamelFolder *folder, CamelFolderOpenMode mode)
 
 
 /**
- * __camel_folder_close:Close a folder.
+ * _close:Close a folder.
  * @folder: 
  * @expunge: if TRUE, the flagged message are deleted.
  * 
@@ -152,7 +152,7 @@ __camel_folder_open(CamelFolder *folder, CamelFolderOpenMode mode)
  * expunge the flagged messages.
  **/
 static void
-__camel_folder_close(CamelFolder *folder, gboolean expunge)
+_close(CamelFolder *folder, gboolean expunge)
 {
 	if (expunge) CF_CLASS(folder)->expunge(folder);
 	folder->open_state = FOLDER_CLOSE;
@@ -162,7 +162,7 @@ __camel_folder_close(CamelFolder *folder, gboolean expunge)
 
 
 /**
- * __camel_folder_set_name:set the (short) name of the folder
+ * _set_name:set the (short) name of the folder
  * @folder: folder
  * @name: new name of the folder
  * 
@@ -171,7 +171,7 @@ __camel_folder_close(CamelFolder *folder, gboolean expunge)
  * 
  **/
 static void
-__camel_folder_set_name(CamelFolder *folder, GString *name)
+_set_name(CamelFolder *folder, GString *name)
 {
     if (folder->name) g_string_free(folder->name, 0);;
     folder->name = name;
@@ -180,7 +180,7 @@ __camel_folder_set_name(CamelFolder *folder, GString *name)
 
 
 /**
- * __camel_folder_set_full_name:set the (full) name of the folder
+ * _set_full_name:set the (full) name of the folder
  * @folder: folder
  * @name: new name of the folder
  * 
@@ -189,7 +189,7 @@ __camel_folder_set_name(CamelFolder *folder, GString *name)
  * 
  **/
 static void
-__camel_folder_set_full_name(CamelFolder *folder, GString *name)
+_set_full_name(CamelFolder *folder, GString *name)
 {
     if (folder->full_name) g_string_free(folder->full_name, 0);;
     folder->full_name = name;
@@ -199,7 +199,7 @@ __camel_folder_set_full_name(CamelFolder *folder, GString *name)
 
 
 /**
- * __camel_folder_get_name: get the (short) name of the folder
+ * _get_name: get the (short) name of the folder
  * @folder: 
  * 
  * get the name of the folder. The fully qualified name
@@ -208,14 +208,14 @@ __camel_folder_set_full_name(CamelFolder *folder, GString *name)
  * Return value: name of the folder
  **/
 static GString *
-__camel_folder_get_name(CamelFolder *folder)
+_get_name(CamelFolder *folder)
 {
 	return folder->name;
 }
 
 
 /**
- * __camel_folder_get_full_name:get the (full) name of the folder
+ * _get_full_name:get the (full) name of the folder
  * @folder: folder to get the name 
  * 
  * get the name of the folder. 
@@ -223,7 +223,7 @@ __camel_folder_get_name(CamelFolder *folder)
  * Return value: full name of the folder
  **/
 static GString *
-__camel_folder_get_full_name(CamelFolder *folder)
+_get_full_name(CamelFolder *folder)
 {
 	return folder->full_name;
 }
@@ -231,7 +231,7 @@ __camel_folder_get_full_name(CamelFolder *folder)
 
 
 /**
- * __camel_folder_can_hold_folders: tests if the folder can contain other folders
+ * _can_hold_folders: tests if the folder can contain other folders
  * @folder: 
  * 
  * 
@@ -239,7 +239,7 @@ __camel_folder_get_full_name(CamelFolder *folder)
  * Return value: 
  **/
 static gboolean
-__camel_folder_can_hold_folders(CamelFolder *folder)
+_can_hold_folders(CamelFolder *folder)
 {
     return folder->can_hold_folders;
 }
@@ -248,7 +248,7 @@ __camel_folder_can_hold_folders(CamelFolder *folder)
 
 
 /**
- * __camel_folder_can_hold_messages: tests if the folder can contain messages
+ * _can_hold_messages: tests if the folder can contain messages
  * @folder: 
  * 
  * 
@@ -256,7 +256,7 @@ __camel_folder_can_hold_folders(CamelFolder *folder)
  * Return value: 
  **/
 static gboolean
-__camel_folder_can_hold_messages(CamelFolder *folder)
+_can_hold_messages(CamelFolder *folder)
 {
     return folder->can_hold_messages;
 }
@@ -264,7 +264,7 @@ __camel_folder_can_hold_messages(CamelFolder *folder)
 
 
 /**
- * __camel_folder_exists: tests if the folder object exists on the store.
+ * _exists: tests if the folder object exists on the store.
  * @folder: 
  * 
  * 
@@ -272,7 +272,7 @@ __camel_folder_can_hold_messages(CamelFolder *folder)
  * Return value: 
  **/
 static gboolean
-__camel_folder_exists(CamelFolder *folder)
+_exists(CamelFolder *folder)
 {
     return folder->exists_on_store;
 }
@@ -280,7 +280,7 @@ __camel_folder_exists(CamelFolder *folder)
 
 
 /**
- * __camel_folder_is_open:
+ * _is_open:
  * @folder: 
  * 
  * 
@@ -288,7 +288,7 @@ __camel_folder_exists(CamelFolder *folder)
  * Return value: 
  **/
 static gboolean
-__camel_folder_is_open(CamelFolder *folder)
+_is_open(CamelFolder *folder)
 {
     return (folder->open_state==FOLDER_OPEN);
 }
@@ -297,7 +297,7 @@ __camel_folder_is_open(CamelFolder *folder)
 
 
 /** 
- * __camel_folder_get_folder: return the (sub)folder object that
+ * _get_folder: return the (sub)folder object that
  * is specified.
  *
  * This method returns a folder objects. This folder
@@ -310,7 +310,7 @@ __camel_folder_is_open(CamelFolder *folder)
  *        could not be created
  **/
 static CamelFolder *
-__camel_folder_get_folder(CamelFolder *folder, GString *folder_name)
+_get_folder(CamelFolder *folder, GString *folder_name)
 {
     g_warning("getFolder called on the abstract CamelFolder class\n");
     return NULL;
@@ -339,7 +339,7 @@ camel_folder_get_folder(CamelFolder *folder, GString *folder_name)
 
 
 /**
- * __camel_folder_create:
+ * _create:
  * @folder: 
  * 
  * this routine handles the recursion mechanism.
@@ -351,7 +351,7 @@ camel_folder_get_folder(CamelFolder *folder, GString *folder_name)
  * Return value: 
  **/
 static gboolean
-__camel_folder_create(CamelFolder *folder)
+_create(CamelFolder *folder)
 {
 	GString *prefix;
 	gchar dich_result;
@@ -407,7 +407,7 @@ camel_folder_create(CamelFolder *folder)
 
 
 /**
- * __camel_folder_delete: delete folder 
+ * _delete: delete folder 
  * @folder: folder to delete
  * @recurse: true is subfolders must also be deleted
  * 
@@ -430,7 +430,7 @@ camel_folder_create(CamelFolder *folder)
  * Return value: true if the folder has been deleted
  **/
 static gboolean
-__camel_folder_delete (CamelFolder *folder, gboolean recurse)
+_delete (CamelFolder *folder, gboolean recurse)
 {
 	GList *subfolders=NULL;
 	GList *sf;
@@ -484,7 +484,7 @@ gboolean camel_folder_delete (CamelFolder *folder, gboolean recurse)
 
 
 /**
- * __camel_folder_delete_messages: delete all messages in the folder
+ * _delete_messages: delete all messages in the folder
  * @folder: 
  * 
  * 
@@ -492,7 +492,7 @@ gboolean camel_folder_delete (CamelFolder *folder, gboolean recurse)
  * Return value: 
  **/
 static gboolean 
-__camel_folder_delete_messages(CamelFolder *folder)
+_delete_messages(CamelFolder *folder)
 {
 	return TRUE;
 }
@@ -518,7 +518,7 @@ camel_folder_delete_messages (CamelFolder *folder)
 
 
 /**
- * __camel_folder_get_parent_folder: return parent folder
+ * _get_parent_folder: return parent folder
  * @folder: folder to get the parent
  * 
  * 
@@ -526,7 +526,7 @@ camel_folder_delete_messages (CamelFolder *folder)
  * Return value: 
  **/
 static CamelFolder *
-__camel_folder_get_parent_folder (CamelFolder *folder)
+_get_parent_folder (CamelFolder *folder)
 {
 	return folder->parent_folder;
 }
@@ -548,7 +548,7 @@ camel_folder_get_parent_folder (CamelFolder *folder)
 
 
 /**
- * __camel_folder_get_parent_store: return parent store
+ * _get_parent_store: return parent store
  * @folder: folder to get the parent
  * 
  * 
@@ -556,7 +556,7 @@ camel_folder_get_parent_folder (CamelFolder *folder)
  * Return value: 
  **/
 static CamelStore *
-__camel_folder_get_parent_store (CamelFolder *folder)
+_get_parent_store (CamelFolder *folder)
 {
 	return folder->parent_store;
 }
@@ -579,7 +579,7 @@ camel_folder_get_parent_store (CamelFolder *folder)
 
 
 /**
- * __camel_folder_get_mode: return the open mode of a folder
+ * _get_mode: return the open mode of a folder
  * @folder: 
  * 
  * 
@@ -587,7 +587,7 @@ camel_folder_get_parent_store (CamelFolder *folder)
  * Return value:  open mode of the folder
  **/
 static CamelFolderOpenMode
-__camel_folder_get_mode(CamelFolder *folder)
+_get_mode(CamelFolder *folder)
 {
     return folder->open_mode;
 }
@@ -611,7 +611,7 @@ camel_folder_get_mode(CamelFolder *folder)
 
 
 static GList *
-__camel_folder_list_subfolders(CamelFolder *folder)
+_list_subfolders(CamelFolder *folder)
 {
 	return NULL;
 }
@@ -635,7 +635,7 @@ camel_folder_list_subfolders(CamelFolder *folder)
 
 
 static GList *
-__camel_folder_expunge(CamelFolder *folder)
+_expunge(CamelFolder *folder)
 {
 	return NULL;
 }
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index 15fd629e1b..5bcd99332f 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -31,25 +31,25 @@ static CamelDataWrapperClass *parent_class=NULL;
 /* Returns the class for a CamelMimePart */
 #define CMP_CLASS(so) CAMEL_MIME_PART_CLASS (GTK_OBJECT(so)->klass)
 
-static void __camel_mime_part_add_header (CamelMimePart *mime_part, GString *header_name, GString *header_value);
-static void __camel_mime_part_remove_header (CamelMimePart *mime_part, GString *header_name);
-static GString *__camel_mime_part_get_header (CamelMimePart *mime_part, GString *header_name);
-static void __camel_mime_part_set_description (CamelMimePart *mime_part, GString *description);
-static GString *__camel_mime_part_get_description (CamelMimePart *mime_part);
-static void __camel_mime_part_set_disposition (CamelMimePart *mime_part, GString *disposition);
-static GString *__camel_mime_part_get_disposition (CamelMimePart *mime_part);
-static void __camel_mime_part_set_filename (CamelMimePart *mime_part, GString *filename);
-static GString *__camel_mime_part_get_filename (CamelMimePart *mime_part);
-static void __camel_mime_part_set_content_id (CamelMimePart *mime_part, GString *content_id);
-static GString *__camel_mime_part_get_content_id (CamelMimePart *mime_part);
-static void __camel_mime_part_set_content_MD5 (CamelMimePart *mime_part, GString *content_MD5);
-static GString *__camel_mime_part_get_content_MD5 (CamelMimePart *mime_part);
-static void __camel_mime_part_set_encoding (CamelMimePart *mime_part, GString *encoding);
-static GString *__camel_mime_part_get_encoding (CamelMimePart *mime_part);
-static void __camel_mime_part_set_content_languages (CamelMimePart *mime_part, GList *content_languages);
-static GList *__camel_mime_part_get_content_languages (CamelMimePart *mime_part);
-static void __camel_mime_part_set_header_lines (CamelMimePart *mime_part, GList *header_lines);
-static GList *__camel_mime_part_get_header_lines (CamelMimePart *mime_part);
+static void _add_header (CamelMimePart *mime_part, GString *header_name, GString *header_value);
+static void _remove_header (CamelMimePart *mime_part, GString *header_name);
+static GString *_get_header (CamelMimePart *mime_part, GString *header_name);
+static void _set_description (CamelMimePart *mime_part, GString *description);
+static GString *_get_description (CamelMimePart *mime_part);
+static void _set_disposition (CamelMimePart *mime_part, GString *disposition);
+static GString *_get_disposition (CamelMimePart *mime_part);
+static void _set_filename (CamelMimePart *mime_part, GString *filename);
+static GString *_get_filename (CamelMimePart *mime_part);
+static void _set_content_id (CamelMimePart *mime_part, GString *content_id);
+static GString *_get_content_id (CamelMimePart *mime_part);
+static void _set_content_MD5 (CamelMimePart *mime_part, GString *content_MD5);
+static GString *_get_content_MD5 (CamelMimePart *mime_part);
+static void _set_encoding (CamelMimePart *mime_part, GString *encoding);
+static GString *_get_encoding (CamelMimePart *mime_part);
+static void _set_content_languages (CamelMimePart *mime_part, GList *content_languages);
+static GList *_get_content_languages (CamelMimePart *mime_part);
+static void _set_header_lines (CamelMimePart *mime_part, GList *header_lines);
+static GList *_get_header_lines (CamelMimePart *mime_part);
 
 
 
@@ -61,25 +61,25 @@ camel_mime_part_class_init (CamelMimePartClass *camel_mime_part_class)
 	parent_class = gtk_type_class (camel_data_wrapper_get_type ());
 	
 	/* virtual method definition */
-	camel_mime_part_class->add_header=__camel_mime_part_add_header;
-	camel_mime_part_class->remove_header=__camel_mime_part_remove_header;
-	camel_mime_part_class->get_header=__camel_mime_part_get_header;
-	camel_mime_part_class->set_description=__camel_mime_part_set_description;
-	camel_mime_part_class->get_description=__camel_mime_part_get_description;
-	camel_mime_part_class->set_disposition=__camel_mime_part_set_disposition;
-	camel_mime_part_class->get_disposition=__camel_mime_part_get_disposition;
-	camel_mime_part_class->set_filename=__camel_mime_part_set_filename;
-	camel_mime_part_class->get_filename=__camel_mime_part_get_filename;
-	camel_mime_part_class->set_content_id=__camel_mime_part_set_content_id;
-	camel_mime_part_class->get_content_id=__camel_mime_part_get_content_id;
-	camel_mime_part_class->set_content_MD5=__camel_mime_part_set_content_MD5;
-	camel_mime_part_class->get_content_MD5=__camel_mime_part_get_content_MD5;
-	camel_mime_part_class->set_encoding=__camel_mime_part_set_encoding;
-	camel_mime_part_class->get_encoding=__camel_mime_part_get_encoding;
-	camel_mime_part_class->set_content_languages=__camel_mime_part_set_content_languages;
-	camel_mime_part_class->get_content_languages=__camel_mime_part_get_content_languages;
-	camel_mime_part_class->set_header_lines=__camel_mime_part_set_header_lines;
-	camel_mime_part_class->get_header_lines=__camel_mime_part_get_header_lines;
+	camel_mime_part_class->add_header=_add_header;
+	camel_mime_part_class->remove_header=_remove_header;
+	camel_mime_part_class->get_header=_get_header;
+	camel_mime_part_class->set_description=_set_description;
+	camel_mime_part_class->get_description=_get_description;
+	camel_mime_part_class->set_disposition=_set_disposition;
+	camel_mime_part_class->get_disposition=_get_disposition;
+	camel_mime_part_class->set_filename=_set_filename;
+	camel_mime_part_class->get_filename=_get_filename;
+	camel_mime_part_class->set_content_id=_set_content_id;
+	camel_mime_part_class->get_content_id=_get_content_id;
+	camel_mime_part_class->set_content_MD5=_set_content_MD5;
+	camel_mime_part_class->get_content_MD5=_get_content_MD5;
+	camel_mime_part_class->set_encoding=_set_encoding;
+	camel_mime_part_class->get_encoding=_get_encoding;
+	camel_mime_part_class->set_content_languages=_set_content_languages;
+	camel_mime_part_class->get_content_languages=_get_content_languages;
+	camel_mime_part_class->set_header_lines=_set_header_lines;
+	camel_mime_part_class->get_header_lines=_get_header_lines;
 
 
 	/* virtual method overload */
@@ -119,7 +119,7 @@ camel_mime_part_get_type (void)
 
 
 static void
-__camel_mime_part_add_header (CamelMimePart *mime_part, GString *header_name, GString *header_value)
+_add_header (CamelMimePart *mime_part, GString *header_name, GString *header_value)
 {
 	gboolean header_exists;
 	GString *old_header_name;
@@ -146,7 +146,7 @@ camel_mime_part_add_header (CamelMimePart *mime_part, GString *header_name, GStr
 
 
 static void
-__camel_mime_part_remove_header (CamelMimePart *mime_part, GString *header_name)
+_remove_header (CamelMimePart *mime_part, GString *header_name)
 {
 	
 	gboolean header_exists;
@@ -174,7 +174,7 @@ camel_mime_part_remove_header (CamelMimePart *mime_part, GString *header_name)
 
 
 static GString *
-__camel_mime_part_get_header (CamelMimePart *mime_part, GString *header_name)
+_get_header (CamelMimePart *mime_part, GString *header_name)
 {
 	
 	GString *old_header_name;
@@ -194,7 +194,7 @@ camel_mime_part_get_header (CamelMimePart *mime_part, GString *header_name)
 
 
 static void
-__camel_mime_part_set_description (CamelMimePart *mime_part, GString *description)
+_set_description (CamelMimePart *mime_part, GString *description)
 {
 	if (mime_part->description) g_free(mime_part->description);
 	mime_part->description = description;
@@ -210,7 +210,7 @@ camel_mime_part_set_description (CamelMimePart *mime_part, GString *description)
 
 
 static GString *
-__camel_mime_part_get_description (CamelMimePart *mime_part)
+_get_description (CamelMimePart *mime_part)
 {
 	return mime_part->description;
 }
@@ -224,7 +224,7 @@ camel_mime_part_get_description (CamelMimePart *mime_part)
 
 
 static void
-__camel_mime_part_set_disposition (CamelMimePart *mime_part, GString *disposition)
+_set_disposition (CamelMimePart *mime_part, GString *disposition)
 {
 	if (mime_part->disposition) g_free(mime_part->disposition);
 	mime_part->disposition = disposition;
@@ -240,7 +240,7 @@ camel_mime_part_set_disposition (CamelMimePart *mime_part, GString *disposition)
 
 
 static GString *
-__camel_mime_part_get_disposition (CamelMimePart *mime_part)
+_get_disposition (CamelMimePart *mime_part)
 {
 	return mime_part->disposition;
 }
@@ -255,7 +255,7 @@ camel_mime_part_get_disposition (CamelMimePart *mime_part)
 
 
 static void
-__camel_mime_part_set_filename (CamelMimePart *mime_part, GString *filename)
+_set_filename (CamelMimePart *mime_part, GString *filename)
 {
 	if (mime_part->filename) g_free(mime_part->filename);
 	mime_part->filename = filename;
@@ -271,7 +271,7 @@ camel_mime_part_set_filename (CamelMimePart *mime_part, GString *filename)
 
 
 static GString *
-__camel_mime_part_get_filename (CamelMimePart *mime_part)
+_get_filename (CamelMimePart *mime_part)
 {
 	return mime_part->filename;
 }
@@ -286,7 +286,7 @@ camel_mime_part_get_filename (CamelMimePart *mime_part)
 
 /* this routine must not be public */
 static void
-__camel_mime_part_set_content_id (CamelMimePart *mime_part, GString *content_id)
+_set_content_id (CamelMimePart *mime_part, GString *content_id)
 {
 	if (mime_part->content_id) g_free(mime_part->content_id);
 	mime_part->content_id = content_id;
@@ -294,7 +294,7 @@ __camel_mime_part_set_content_id (CamelMimePart *mime_part, GString *content_id)
 
 
 static GString *
-__camel_mime_part_get_content_id (CamelMimePart *mime_part)
+_get_content_id (CamelMimePart *mime_part)
 {
 	return mime_part->content_id;
 }
@@ -309,7 +309,7 @@ camel_mime_part_get_content_id (CamelMimePart *mime_part)
 
 /* this routine must not be public */
 static void
-__camel_mime_part_set_content_MD5 (CamelMimePart *mime_part, GString *content_MD5)
+_set_content_MD5 (CamelMimePart *mime_part, GString *content_MD5)
 {
 	if (mime_part->content_MD5) g_free(mime_part->content_MD5);
 	mime_part->content_MD5 = content_MD5;
@@ -317,7 +317,7 @@ __camel_mime_part_set_content_MD5 (CamelMimePart *mime_part, GString *content_MD
 
 
 static GString *
-__camel_mime_part_get_content_MD5 (CamelMimePart *mime_part)
+_get_content_MD5 (CamelMimePart *mime_part)
 {
 	return mime_part->content_MD5;
 }
@@ -331,7 +331,7 @@ camel_mime_part_get_content_MD5 (CamelMimePart *mime_part)
 
 
 static void
-__camel_mime_part_set_encoding (CamelMimePart *mime_part, GString *encoding)
+_set_encoding (CamelMimePart *mime_part, GString *encoding)
 {
 	if (mime_part->encoding) g_free(mime_part->encoding);
 	mime_part->encoding = encoding;
@@ -346,7 +346,7 @@ camel_mime_part_set_encoding (CamelMimePart *mime_part, GString *encoding)
 
 
 static GString *
-__camel_mime_part_get_encoding (CamelMimePart *mime_part)
+_get_encoding (CamelMimePart *mime_part)
 {
 	return mime_part->encoding;
 }
@@ -361,7 +361,7 @@ camel_mime_part_get_encoding (CamelMimePart *mime_part)
 
 
 static void
-__camel_mime_part_set_content_languages (CamelMimePart *mime_part, GList *content_languages)
+_set_content_languages (CamelMimePart *mime_part, GList *content_languages)
 {
 	if (mime_part->content_languages) g_string_list_free(mime_part->content_languages);
 	mime_part->content_languages = content_languages;
@@ -376,7 +376,7 @@ camel_mime_part_set_content_languages (CamelMimePart *mime_part, GList *content_
 
 
 static GList *
-__camel_mime_part_get_content_languages (CamelMimePart *mime_part)
+_get_content_languages (CamelMimePart *mime_part)
 {
 	return mime_part->content_languages;
 }
@@ -391,7 +391,7 @@ camel_mime_part_get_content_languages (CamelMimePart *mime_part)
 
 
 static void
-__camel_mime_part_set_header_lines (CamelMimePart *mime_part, GList *header_lines)
+_set_header_lines (CamelMimePart *mime_part, GList *header_lines)
 {
 	if (mime_part->header_lines) g_string_list_free(mime_part->header_lines);
 	mime_part->header_lines = header_lines;
@@ -406,7 +406,7 @@ camel_mime_part_set_header_lines (CamelMimePart *mime_part, GList *header_lines)
 
 
 static GList *
-__camel_mime_part_get_header_lines (CamelMimePart *mime_part)
+_get_header_lines (CamelMimePart *mime_part)
 {
 	return mime_part->header_lines;
 }
diff --git a/camel/camel-mime-part.h b/camel/camel-mime-part.h
index d72d6c5356..ecf1928691 100644
--- a/camel/camel-mime-part.h
+++ b/camel/camel-mime-part.h
@@ -57,6 +57,8 @@ typedef struct
 	GString *filename;
 	GList *header_lines;
 
+	CamelDataWrapper *content; /* part real content */
+
 } CamelMimePart;
 
 
diff --git a/camel/camel-service.c b/camel/camel-service.c
index e843826a81..2ca3d6f352 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -28,12 +28,12 @@ static GtkObjectClass *parent_class=NULL;
 /* Returns the class for a CamelService */
 #define CSERV_CLASS(so) CAMEL_SERVICE_CLASS (GTK_OBJECT(so)->klass)
 
-static void __camel_service_connect(CamelService *service);
-static void __camel_service_connect_to_with_login_passwd(CamelService *service, GString *host, GString *login, GString *passwd);
-static void __camel_service_connect_to_with_login_passwd_port(CamelService *service, GString *host, GString *login, GString *passwd, guint port);
-static gboolean __camel_service_is_connected(CamelService *service);
-static void __camel_service_set_connected(CamelService *service, gboolean state);
-static GString *__camel_service_get_url(CamelService *service);
+static void _connect(CamelService *service);
+static void _connect_to_with_login_passwd(CamelService *service, GString *host, GString *login, GString *passwd);
+static void _connect_to_with_login_passwd_port(CamelService *service, GString *host, GString *login, GString *passwd, guint port);
+static gboolean _is_connected(CamelService *service);
+static void _set_connected(CamelService *service, gboolean state);
+static GString *_get_url(CamelService *service);
 
 static void
 camel_service_class_init (CamelServiceClass *camel_service_class)
@@ -41,12 +41,12 @@ camel_service_class_init (CamelServiceClass *camel_service_class)
 	parent_class = gtk_type_class (gtk_object_get_type ());
 	
 	/* virtual method definition */
-	camel_service_class->connect = __camel_service_connect;
-	camel_service_class->connect_to_with_login_passwd = __camel_service_connect_to_with_login_passwd;
-	camel_service_class->connect_to_with_login_passwd_port = __camel_service_connect_to_with_login_passwd_port;
-	camel_service_class->is_connected = __camel_service_is_connected;
-	camel_service_class->set_connected = __camel_service_set_connected;
-	camel_service_class->get_url = __camel_service_get_url;
+	camel_service_class->connect = _connect;
+	camel_service_class->connect_to_with_login_passwd = _connect_to_with_login_passwd;
+	camel_service_class->connect_to_with_login_passwd_port = _connect_to_with_login_passwd_port;
+	camel_service_class->is_connected = _is_connected;
+	camel_service_class->set_connected = _set_connected;
+	camel_service_class->get_url = _get_url;
 
 	/* virtual method overload */
 }
@@ -86,7 +86,7 @@ camel_service_get_type (void)
 
 
 /**
- * __camel_service_connect : connect to a service 
+ * _connect : connect to a service 
  *
  * connect to the service using the parameters 
  * stored in the session it is initialized with
@@ -95,7 +95,7 @@ camel_service_get_type (void)
  * @service: object to connect
  **/
 static void
-__camel_service_connect(CamelService *service)
+_connect(CamelService *service)
 {
 	CSERV_CLASS(service)->set_connected(service, TRUE);
 }
@@ -119,7 +119,7 @@ camel_service_connect(CamelService *service)
 
 
 /**
- * __camel_service_connect_to: connect to the specified address
+ * _connect_to: connect to the specified address
  * 
  * Connect to the service, but do not use the session
  * default parameters to retrieve server's address
@@ -130,7 +130,7 @@ camel_service_connect(CamelService *service)
  * @passwd: password used to log in
  **/
 static void
-__camel_service_connect_to_with_login_passwd(CamelService *service, GString *host, GString *login, GString *passwd)
+_connect_to_with_login_passwd(CamelService *service, GString *host, GString *login, GString *passwd)
 {
   CSERV_CLASS(service)->set_connected(service, TRUE);
 }
@@ -155,7 +155,7 @@ camel_service_connect_to_with_login_passwd(CamelService *service, GString *host,
 
 
 /**
- * __camel_service_connect_to:login:password : connect to the specified address
+ * _connect_to:login:password : connect to the specified address
  * 
  * Connect to the service, but do not use the session
  * default parameters to retrieve server's address
@@ -168,7 +168,7 @@ camel_service_connect_to_with_login_passwd(CamelService *service, GString *host,
  *
  **/
 static void
-__camel_service_connect_to_with_login_passwd_port(CamelService *service, GString *host, GString *login, GString *passwd, guint port)
+_connect_to_with_login_passwd_port(CamelService *service, GString *host, GString *login, GString *passwd, guint port)
 {
     CSERV_CLASS(service)->set_connected(service, TRUE);
 }
@@ -196,14 +196,14 @@ camel_service_connect_to_with_login_passwd_port(CamelService *service, GString *
 
 
 /**
- * __camel_service_is_connected: test if the service object is connected
+ * _is_connected: test if the service object is connected
  *
  *
  * @service: object to test
  *  
  **/
 static gboolean
-__camel_service_is_connected(CamelService *service)
+_is_connected(CamelService *service)
 {
   return service->connected;
 }
@@ -226,7 +226,7 @@ camel_service_is_connected(CamelService *service)
 
 
 /**
- * __camel_service_set_connected: set the connected state
+ * _set_connected: set the connected state
  * 
  * This routine has to be called by providers to set the 
  * connection state, mainly when the service is disconnected
@@ -237,7 +237,7 @@ camel_service_is_connected(CamelService *service)
  *  
  **/
 static void
-__camel_service_set_connected(CamelService *service, gboolean state)
+_set_connected(CamelService *service, gboolean state)
 {
   service->connected = state;
 }
@@ -245,7 +245,7 @@ __camel_service_set_connected(CamelService *service, gboolean state)
 
 
 /**
- * __camel_service_get_url: get url representing a service
+ * _get_url: get url representing a service
  * @service: the service
  * 
  * This method merely returns the "url" field. Subclasses
@@ -254,7 +254,7 @@ __camel_service_set_connected(CamelService *service, gboolean state)
  * Return value: 
  **/
 static GString *
-__camel_service_get_url(CamelService *service)
+_get_url(CamelService *service)
 {
 	return service->url;
 }
diff --git a/camel/camel-store.c b/camel/camel-store.c
index ba709916b0..133c99fa40 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -28,10 +28,10 @@ static GtkObjectClass *parent_class=NULL;
 /* Returns the class for a CamelStore */
 #define CS_CLASS(so) CAMEL_STORE_CLASS (GTK_OBJECT(so)->klass)
 
-static void camel_store_set_separator(CamelStore *store, gchar sep);
-static CamelFolder *camel_store_get_root_folder(CamelStore *store);
-static CamelFolder *camel_store_get_default_folder(CamelStore *store);
-static void __camel_store_init(CamelStore *store, CamelSession *session, GString *url_name);
+static void _set_separator(CamelStore *store, gchar sep);
+static CamelFolder *_get_root_folder(CamelStore *store);
+static CamelFolder *_get_default_folder(CamelStore *store);
+static void _init(CamelStore *store, CamelSession *session, GString *url_name);
 
 
 
@@ -41,12 +41,12 @@ camel_store_class_init (CamelStoreClass *camel_store_class)
 	parent_class = gtk_type_class (camel_service_get_type ());
 	
 	/* virtual method definition */
-	camel_store_class->init = __camel_store_init;
-	camel_store_class->set_separator = camel_store_set_separator;
-	camel_store_class->get_separator = camel_store_get_separator;
-	camel_store_class->get_folder = camel_store_get_folder;
-	camel_store_class->get_root_folder = camel_store_get_root_folder;
-	camel_store_class->get_default_folder = camel_store_get_default_folder;
+	camel_store_class->init = _init;
+	camel_store_class->set_separator = _set_separator;
+	camel_store_class->get_separator = _get_separator;
+	camel_store_class->get_folder = _get_folder;
+	camel_store_class->get_root_folder = _get_root_folder;
+	camel_store_class->get_default_folder = _get_default_folder;
 	/* virtual method overload */
 }
 
@@ -114,7 +114,7 @@ camel_store_init(CamelStore *store, CamelSession *session, GString *url_name)
  * 
  **/
 static void 
-__camel_store_init(CamelStore *store, CamelSession *session, GString *url_name)
+_init(CamelStore *store, CamelSession *session, GString *url_name)
 {
 	
 	
@@ -136,7 +136,7 @@ __camel_store_init(CamelStore *store, CamelSession *session, GString *url_name)
  *
  **/
 static void
-camel_store_set_separator(CamelStore *store, gchar sep)
+_set_separator(CamelStore *store, gchar sep)
 {
     store->separator = sep;
 }
@@ -151,7 +151,7 @@ camel_store_set_separator(CamelStore *store, gchar sep)
  *
  **/
 gchar
-camel_store_get_separator(CamelStore *store)
+_get_separator(CamelStore *store)
 {
 	g_assert(store);
 	return store->separator;
@@ -178,7 +178,7 @@ camel_store_get_separator(CamelStore *store)
  * Return value: the folder
  **/
 CamelFolder *
-camel_store_get_folder(CamelStore *store, GString *folder_name)
+_get_folder(CamelStore *store, GString *folder_name)
 {
 
 #warning fill this part in.
@@ -196,7 +196,7 @@ camel_store_get_folder(CamelStore *store, GString *folder_name)
  * @Return value: the tolevel folder.
  **/
 static CamelFolder *
-camel_store_get_root_folder(CamelStore *store)
+_get_root_folder(CamelStore *store)
 {
     return NULL;
 }
@@ -211,7 +211,7 @@ camel_store_get_root_folder(CamelStore *store)
  *  @Return value: the default folder.
  **/
 static CamelFolder *
-camel_store_get_default_folder(CamelStore *store)
+_get_default_folder(CamelStore *store)
 {
     return NULL;
 }