temporarily reverting my camel namespace patches until after we merge in some of the other branches

svn path=/trunk/; revision=22373

1 files changed, 13 insertions, 10 deletions

diff --git a/camel/camel-medium.h b/camel/camel-medium.h
index 7b01eae39f..26040b2a94 100644
--- a/camel/camel-medium.h
+++ b/camel/camel-medium.h
@@ -31,7 +31,7 @@
 #ifdef __cplusplus
 extern "C" {
 #pragma }
-#endif /* __cplusplus */
+#endif /* __cplusplus }*/
 
 #include <camel/camel-data-wrapper.h>
 
@@ -46,7 +46,8 @@ typedef struct {
 	const char *value;
 } CamelMediumHeader;
 
-struct _CamelMedium {
+struct _CamelMedium
+{
 	CamelDataWrapper parent_object;
 
 	/* The content of the medium, as opposed to our parent
@@ -54,32 +55,34 @@ struct _CamelMedium {
 	 * content.
 	 */
 	CamelDataWrapper *content;
+
 };
 
 typedef struct {
 	CamelDataWrapperClass parent_class;
 
 	/* Virtual methods */
-	void  (*add_header) (CamelMedium *medium, const char *name, const void *value);
-	void  (*set_header) (CamelMedium *medium, const char *name, const void *value);
-	void  (*remove_header) (CamelMedium *medium, const char *name);
-	const void * (*get_header) (CamelMedium *medium,  const char *name);
+	void  (*add_header) (CamelMedium *medium, const gchar *header_name, const void *header_value);
+	void  (*set_header) (CamelMedium *medium, const gchar *header_name, const void *header_value);
+	void  (*remove_header) (CamelMedium *medium, const gchar *header_name);
+	const void * (*get_header) (CamelMedium *medium,  const gchar *header_name);
 
 	GArray * (*get_headers) (CamelMedium *medium);
 	void (*free_headers) (CamelMedium *medium, GArray *headers);
 
 	CamelDataWrapper * (*get_content_object) (CamelMedium *medium);
 	void (*set_content_object) (CamelMedium *medium, CamelDataWrapper *content);
+
 } CamelMediumClass;
 
 /* Standard Camel function */
 CamelType camel_medium_get_type (void);
 
 /* Header get/set interface */
-void camel_medium_add_header (CamelMedium *medium, const char *name, const void *value);
-void camel_medium_set_header (CamelMedium *medium, const char *name, const void *value);
-void camel_medium_remove_header (CamelMedium *medium, const char *name);
-const void *camel_medium_get_header (CamelMedium *medium, const char *name);
+void camel_medium_add_header (CamelMedium *medium, const gchar *header_name, const void *header_value);
+void camel_medium_set_header (CamelMedium *medium, const gchar *header_name, const void *header_value);
+void camel_medium_remove_header (CamelMedium *medium, const gchar *header_name);
+const void *camel_medium_get_header (CamelMedium *medium, const gchar *header_name);
 
 GArray *camel_medium_get_headers (CamelMedium *medium);
 void camel_medium_free_headers (CamelMedium *medium, GArray *headers);