Add c++ armoring.

2002-03-01  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-vtrash-folder.h:
	* camel-vee-store.h:
	* camel-vee-folder.h:
	* camel-stream-null.h:
	* camel-stream-filter.h:
	* camel-store-summary.h:
	* camel-news-address.h:
	* camel-mime-utils.h:
	* camel-mime-parser.h:
	* camel-mime-filter-save.h:
	* camel-mime-filter-linewrap.h:
	* camel-mime-filter-index.h:
	* camel-mime-filter-html.h:
	* camel-mime-filter.h:
	* camel-mime-filter-from.h:
	* camel-mime-filter-crlf.h:
	* camel-mime-filter-chomp.h:
	* camel-mime-filter-charset.h:
	* camel-mime-filter-bestenc.h:
	* camel-mime-filter-basic.h:
	* camel-internet-address.h:
	* camel-folder-thread.h:
	* camel-folder-summary.h:
	* camel-folder-search.h:
	* camel-filter-driver.h:
	* camel-charset-map.h:
	* camel-address.h: Add c++ armoring.

	* camel-object.h: s/class/klass

svn path=/trunk/; revision=15885

30 files changed, 324 insertions, 18 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 1ba9ec8617..3820ce8426 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,37 @@
 2002-03-01  Jeffrey Stedfast  <fejj@ximian.com>
 
+	* camel-vtrash-folder.h: 
+	* camel-vee-store.h: 
+	* camel-vee-folder.h: 
+	* camel-stream-null.h: 
+	* camel-stream-filter.h: 
+	* camel-store-summary.h: 
+	* camel-news-address.h: 
+	* camel-mime-utils.h: 
+	* camel-mime-parser.h: 
+	* camel-mime-filter-save.h: 
+	* camel-mime-filter-linewrap.h: 
+	* camel-mime-filter-index.h: 
+	* camel-mime-filter-html.h: 
+	* camel-mime-filter.h: 
+	* camel-mime-filter-from.h: 
+	* camel-mime-filter-crlf.h: 
+	* camel-mime-filter-chomp.h: 
+	* camel-mime-filter-charset.h: 
+	* camel-mime-filter-bestenc.h: 
+	* camel-mime-filter-basic.h: 
+	* camel-internet-address.h: 
+	* camel-folder-thread.h: 
+	* camel-folder-summary.h: 
+	* camel-folder-search.h: 
+	* camel-filter-driver.h: 
+	* camel-charset-map.h: 
+	* camel-address.h: Add c++ armoring.
+
+	* camel-object.h: s/class/klass
+
+2002-03-01  Jeffrey Stedfast  <fejj@ximian.com>
+
 	* camel-mime-part-utils.c
 	(camel_mime_part_construct_content_from_parser): Reverted my
 	pgp/mime fixes here too.
diff --git a/camel/camel-address.h b/camel/camel-address.h
index 02dfdcd838..caf7e97755 100644
--- a/camel/camel-address.h
+++ b/camel/camel-address.h
@@ -21,6 +21,11 @@
 #ifndef _CAMEL_ADDRESS_H
 #define _CAMEL_ADDRESS_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <glib.h>
 #include <camel/camel-object.h>
 
@@ -67,4 +72,8 @@ int		camel_address_copy	(CamelAddress *, const CamelAddress *);
 
 void		camel_address_remove	(CamelAddress *, int index);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_ADDRESS_H */
diff --git a/camel/camel-charset-map.h b/camel/camel-charset-map.h
index 0cae1916a6..ab60ef5bf5 100644
--- a/camel/camel-charset-map.h
+++ b/camel/camel-charset-map.h
@@ -21,6 +21,11 @@
 #ifndef _CAMEL_CHARSET_MAP_H
 #define _CAMEL_CHARSET_MAP_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <iconv.h>
 
 typedef struct _CamelCharset CamelCharset;
@@ -39,4 +44,8 @@ const char *camel_charset_best(const char *in, int len);
 
 const char *camel_charset_iso_to_windows (const char *isocharset);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_CHARSET_MAP_H */
diff --git a/camel/camel-filter-driver.h b/camel/camel-filter-driver.h
index f33b529700..3f86a47a33 100644
--- a/camel/camel-filter-driver.h
+++ b/camel/camel-filter-driver.h
@@ -22,6 +22,11 @@
 #ifndef _CAMEL_FILTER_DRIVER_H
 #define _CAMEL_FILTER_DRIVER_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <glib.h>
 #include <camel/camel-object.h>
 #include <camel/camel-session.h>
@@ -107,4 +112,8 @@ int camel_filter_driver_rule_count (CamelFilterDriver *d);
 struct filter_option *camel_filter_driver_rule_get (CamelFilterDriver *d, int n);
 #endif
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_FILTER_DRIVER_H */
diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h
index 65860d9969..59f31d3628 100644
--- a/camel/camel-folder-search.h
+++ b/camel/camel-folder-search.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -21,6 +22,11 @@
 #ifndef _CAMEL_FOLDER_SEARCH_H
 #define _CAMEL_FOLDER_SEARCH_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <e-util/e-sexp.h>
 #include <libibex/ibex.h>
 #include <camel/camel-folder.h>
@@ -117,4 +123,8 @@ gboolean camel_folder_search_match_expression(CamelFolderSearch *search, const c
 					      const CamelMessageInfo *info, CamelException *ex);
 void camel_folder_search_free_result(CamelFolderSearch *search, GPtrArray *);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_FOLDER_SEARCH_H */
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index f63a1d49a0..11fe8d5680 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -21,6 +22,11 @@
 #ifndef _CAMEL_FOLDER_SUMMARY_H
 #define _CAMEL_FOLDER_SUMMARY_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <stdio.h>
 #include <time.h>
 #include <camel/camel-mime-parser.h>
@@ -327,4 +333,8 @@ void camel_message_info_set_string(CamelMessageInfo *mi, int type, char *str);
 #define camel_message_info_set_mlist(x, s) (g_free(((CamelMessageInfo *)(x))->mlist),((CamelMessageInfo *)(x))->mlist = (s))
 #endif
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_FOLDER_SUMMARY_H */
diff --git a/camel/camel-folder-thread.h b/camel/camel-folder-thread.h
index d45a69a396..5999b7bab8 100644
--- a/camel/camel-folder-thread.h
+++ b/camel/camel-folder-thread.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -21,6 +22,11 @@
 #ifndef _CAMEL_FOLDER_THREAD_H
 #define _CAMEL_FOLDER_THREAD_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-folder-summary.h>
 #include <camel/camel-folder.h>
 
@@ -54,4 +60,8 @@ void camel_folder_thread_messages_destroy(CamelFolderThread *threads);
 /* debugging function only */
 int camel_folder_threaded_messages_dump(CamelFolderThreadNode *c);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* !_CAMEL_FOLDER_THREAD_H */
diff --git a/camel/camel-internet-address.h b/camel/camel-internet-address.h
index 1ed14a1ecd..9bfa0f44c2 100644
--- a/camel/camel-internet-address.h
+++ b/camel/camel-internet-address.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -21,6 +22,11 @@
 #ifndef _CAMEL_INTERNET_ADDRESS_H
 #define _CAMEL_INTERNET_ADDRESS_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-address.h>
 
 #define CAMEL_INTERNET_ADDRESS(obj)         CAMEL_CHECK_CAST (obj, camel_internet_address_get_type (), CamelInternetAddress)
@@ -52,4 +58,8 @@ int			camel_internet_address_find_address(CamelInternetAddress *, const char *,
 char *			camel_internet_address_encode_address(int *len, const char *name, const char *addr);
 char *			camel_internet_address_format_address(const char *real, const char *addr);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_INTERNET_ADDRESS_H */
diff --git a/camel/camel-mime-filter-basic.h b/camel/camel-mime-filter-basic.h
index 1ec5f2ec17..196f0bdb09 100644
--- a/camel/camel-mime-filter-basic.h
+++ b/camel/camel-mime-filter-basic.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -21,6 +22,11 @@
 #ifndef _CAMEL_MIME_FILTER_BASIC_H
 #define _CAMEL_MIME_FILTER_BASIC_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-mime-filter.h>
 
 #define CAMEL_MIME_FILTER_BASIC(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_basic_get_type (), CamelMimeFilterBasic)
@@ -58,4 +64,8 @@ guint		camel_mime_filter_basic_get_type	(void);
 CamelMimeFilterBasic      *camel_mime_filter_basic_new	(void);
 CamelMimeFilterBasic      *camel_mime_filter_basic_new_type	(CamelMimeFilterBasicType type);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_MIME_FILTER_BASIC_H */
diff --git a/camel/camel-mime-filter-bestenc.h b/camel/camel-mime-filter-bestenc.h
index 8fa3e3599f..8950a95a0a 100644
--- a/camel/camel-mime-filter-bestenc.h
+++ b/camel/camel-mime-filter-bestenc.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -21,6 +22,11 @@
 #ifndef _CAMEL_MIME_FILTER_BESTENC_H
 #define _CAMEL_MIME_FILTER_BESTENC_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-mime-filter.h>
 #include <camel/camel-mime-part.h>
 #include <camel/camel-charset-map.h>
@@ -85,4 +91,8 @@ CamelMimePartEncodingType	camel_mime_filter_bestenc_get_best_encoding(CamelMimeF
 const char *		camel_mime_filter_bestenc_get_best_charset(CamelMimeFilterBestenc *f);
 void 			camel_mime_filter_bestenc_set_flags(CamelMimeFilterBestenc *f, unsigned int flags);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_MIME_FILTER_BESTENC_H */
diff --git a/camel/camel-mime-filter-charset.h b/camel/camel-mime-filter-charset.h
index 2d39c3ac55..80cf7d6213 100644
--- a/camel/camel-mime-filter-charset.h
+++ b/camel/camel-mime-filter-charset.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -21,6 +22,11 @@
 #ifndef _CAMEL_MIME_FILTER_CHARSET_H
 #define _CAMEL_MIME_FILTER_CHARSET_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-mime-filter.h>
 #include <iconv.h>
 
@@ -49,4 +55,8 @@ CamelMimeFilterCharset      *camel_mime_filter_charset_new	(void);
 
 CamelMimeFilterCharset      *camel_mime_filter_charset_new_convert	(const char *from_charset, const char *to_charset);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_MIME_FILTER_CHARSET_H */
diff --git a/camel/camel-mime-filter-chomp.h b/camel/camel-mime-filter-chomp.h
index 781f2a6368..6e0081a475 100644
--- a/camel/camel-mime-filter-chomp.h
+++ b/camel/camel-mime-filter-chomp.h
@@ -19,9 +19,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _CAMEL_MIME_FILTER_CHOMP_H
 #define _CAMEL_MIME_FILTER_CHOMP_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-mime-filter.h>
 
 #define CAMEL_MIME_FILTER_CHOMP_TYPE         (camel_mime_filter_chomp_get_type ())
@@ -44,4 +50,8 @@ CamelType camel_mime_filter_chomp_get_type (void);
 
 CamelMimeFilter *camel_mime_filter_chomp_new (void);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_MIME_FILTER_CHOMP_H */
diff --git a/camel/camel-mime-filter-crlf.h b/camel/camel-mime-filter-crlf.h
index 67fa2b7fee..1e3526d600 100644
--- a/camel/camel-mime-filter-crlf.h
+++ b/camel/camel-mime-filter-crlf.h
@@ -20,9 +20,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _CAMEL_MIME_FILTER_CRLF_H
 #define _CAMEL_MIME_FILTER_CRLF_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-mime-filter.h>
 
 #define CAMEL_MIME_FILTER_CRLF_TYPE         (camel_mime_filter_crlf_get_type ())
@@ -60,4 +66,8 @@ CamelType camel_mime_filter_crlf_get_type (void);
 
 CamelMimeFilter *camel_mime_filter_crlf_new (CamelMimeFilterCRLFDirection direction, CamelMimeFilterCRLFMode mode);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_MIME_FILTER_CRLF_H */
diff --git a/camel/camel-mime-filter-from.h b/camel/camel-mime-filter-from.h
index d4dc804937..2176dfcda4 100644
--- a/camel/camel-mime-filter-from.h
+++ b/camel/camel-mime-filter-from.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -18,9 +19,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _CAMEL_MIME_FILTER_FROM_H
 #define _CAMEL_MIME_FILTER_FROM_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-mime-filter.h>
 
 #define CAMEL_MIME_FILTER_FROM(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_from_get_type (), CamelMimeFilterFrom)
@@ -45,4 +52,8 @@ struct _CamelMimeFilterFromClass {
 guint		camel_mime_filter_from_get_type	(void);
 CamelMimeFilterFrom      *camel_mime_filter_from_new	(void);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_MIME_FILTER_FROM_H */
diff --git a/camel/camel-mime-filter-html.h b/camel/camel-mime-filter-html.h
index b4df57933c..f572e3b06d 100644
--- a/camel/camel-mime-filter-html.h
+++ b/camel/camel-mime-filter-html.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2001 Ximian Inc.
  *
@@ -18,9 +19,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _CAMEL_MIME_FILTER_HTML_H
 #define _CAMEL_MIME_FILTER_HTML_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-mime-filter.h>
 
 #define CAMEL_MIME_FILTER_HTML(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_html_get_type (), CamelMimeFilterHTML)
@@ -43,4 +50,8 @@ struct _CamelMimeFilterHTMLClass {
 guint		camel_mime_filter_html_get_type	(void);
 CamelMimeFilterHTML      *camel_mime_filter_html_new	(void);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_MIME_FILTER_HTML_H */
diff --git a/camel/camel-mime-filter-index.h b/camel/camel-mime-filter-index.h
index 2c297c538a..ae8ef60801 100644
--- a/camel/camel-mime-filter-index.h
+++ b/camel/camel-mime-filter-index.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -18,9 +19,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _CAMEL_MIME_FILTER_INDEX_H
 #define _CAMEL_MIME_FILTER_INDEX_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-mime-filter.h>
 #include <libibex/ibex.h>
 
@@ -52,4 +59,8 @@ CamelMimeFilterIndex      *camel_mime_filter_index_new_ibex (ibex *);
 void camel_mime_filter_index_set_name (CamelMimeFilterIndex *, char *);
 void camel_mime_filter_index_set_ibex (CamelMimeFilterIndex *mf, ibex *index);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_MIME_FILTER_INDEX_H */
diff --git a/camel/camel-mime-filter-linewrap.h b/camel/camel-mime-filter-linewrap.h
index f0614587c7..1d6f444da4 100644
--- a/camel/camel-mime-filter-linewrap.h
+++ b/camel/camel-mime-filter-linewrap.h
@@ -22,6 +22,11 @@
 #ifndef _CAMEL_MIME_FILTER_LINEWRAP_H
 #define _CAMEL_MIME_FILTER_LINEWRAP_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-mime-filter.h>
 
 #define CAMEL_MIME_FILTER_LINEWRAP_TYPE         (camel_mime_filter_linewrap_get_type ())
@@ -48,4 +53,8 @@ CamelType camel_mime_filter_linewrap_get_type (void);
 
 CamelMimeFilter *camel_mime_filter_linewrap_new (guint preferred_len, guint max_len, char indent_char);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_MIME_FILTER_LINEWRAP_H */
diff --git a/camel/camel-mime-filter-save.h b/camel/camel-mime-filter-save.h
index f1e54eca5b..20ebbea6f4 100644
--- a/camel/camel-mime-filter-save.h
+++ b/camel/camel-mime-filter-save.h
@@ -24,6 +24,11 @@
 #ifndef __CAMEL_MIME_FILTER_SAVE_H__
 #define __CAMEL_MIME_FILTER_SAVE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-mime-filter.h>
 #include <camel/camel-seekable-stream.h>
 
@@ -49,4 +54,8 @@ CamelType camel_mime_filter_save_get_type (void);
 CamelMimeFilter *camel_mime_filter_save_new (void);
 CamelMimeFilter *camel_mime_filter_save_new_with_stream (CamelStream *stream);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* __CAMEL_MIME_FILTER_SAVE_H__ */
diff --git a/camel/camel-mime-filter.h b/camel/camel-mime-filter.h
index 76f20ff7f6..3cd65fe8d1 100644
--- a/camel/camel-mime-filter.h
+++ b/camel/camel-mime-filter.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -23,6 +24,11 @@
 #ifndef _CAMEL_MIME_FILTER_H
 #define _CAMEL_MIME_FILTER_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <sys/types.h>
 #include <camel/camel-object.h>
 
@@ -81,4 +87,8 @@ void camel_mime_filter_backup(CamelMimeFilter *f, const char *data, size_t lengt
 /* ensure this much size available for filter output */
 void camel_mime_filter_set_size(CamelMimeFilter *f, size_t size, int keep);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_MIME_FILTER_H */
diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h
index e03924b8b3..7735cc1775 100644
--- a/camel/camel-mime-message.h
+++ b/camel/camel-mime-message.h
@@ -129,7 +129,7 @@ void                        camel_mime_message_set_best_encoding  (CamelMimeMess
 								   CamelBestencEncoding        enctype);
 void                        camel_mime_message_encode_8bit_parts  (CamelMimeMessage           *mime_message);
 
-CamelMimePart              *camel_mime_part_get_part_by_content_id (CamelMimeMessage *message, const char *content_id);
+CamelMimePart              *camel_mime_message_get_part_by_content_id (CamelMimeMessage *message, const char *content_id);
 
 #ifdef __cplusplus
 }
diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h
index c1ef1b58b4..81c2e0d8c8 100644
--- a/camel/camel-mime-parser.h
+++ b/camel/camel-mime-parser.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -18,9 +19,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _CAMEL_MIME_PARSER_H
 #define _CAMEL_MIME_PARSER_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-object.h>
 
 #include <camel/camel-mime-utils.h>
@@ -133,4 +140,8 @@ off_t camel_mime_parser_seek(CamelMimeParser *, off_t, int);
 off_t camel_mime_parser_tell_start_headers(CamelMimeParser *);
 off_t camel_mime_parser_tell_start_from(CamelMimeParser *);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_MIME_PARSER_H */
diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h
index f2327ae6d0..8936012cbd 100644
--- a/camel/camel-mime-utils.h
+++ b/camel/camel-mime-utils.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -19,9 +20,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _CAMEL_MIME_UTILS_H
 #define _CAMEL_MIME_UTILS_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <time.h>
 #include <glib.h>
 
@@ -215,4 +222,8 @@ size_t quoted_encode_close(unsigned char *in, size_t len, unsigned char *out, in
 char *base64_encode_simple (const char *data, size_t len);
 size_t base64_decode_simple (char *data, size_t len);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_MIME_UTILS_H */
diff --git a/camel/camel-news-address.h b/camel/camel-news-address.h
index b0a59312fa..444dfb4580 100644
--- a/camel/camel-news-address.h
+++ b/camel/camel-news-address.h
@@ -1,7 +1,8 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
- *  Authors: 
+ *  Authors: Michael Zucchi <NotZed@ximian.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
@@ -18,9 +19,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _CAMEL_NEWS_ADDRESS_H
 #define _CAMEL_NEWS_ADDRESS_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-address.h>
 
 #define CAMEL_NEWS_ADDRESS(obj)         CAMEL_CHECK_CAST (obj, camel_news_address_get_type (), CamelNewsAddress)
@@ -42,4 +49,8 @@ struct _CamelNewsAddressClass {
 guint		camel_news_address_get_type	(void);
 CamelNewsAddress      *camel_news_address_new	(void);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_NEWS_ADDRESS_H */
diff --git a/camel/camel-object.h b/camel/camel-object.h
index 63f3520809..27e30a7728 100644
--- a/camel/camel-object.h
+++ b/camel/camel-object.h
@@ -38,14 +38,14 @@ extern "C" {
 
 #ifdef G_DISABLE_CHECKS
 #define CAMEL_CHECK_CAST( obj, ctype, ptype )         ((ptype *) obj)
-#define CAMEL_CHECK_CLASS_CAST( class, ctype, ptype ) ((ptype *) class)
+#define CAMEL_CHECK_CLASS_CAST( klass, ctype, ptype ) ((ptype *) klass)
 #define CAMEL_CHECK_TYPE( obj, ctype )                (TRUE)
-#define CAMEL_CHECK_CLASS_TYPE( class, ctype )        (TRUE)
+#define CAMEL_CHECK_CLASS_TYPE( klass, ctype )        (TRUE)
 #else
 #define CAMEL_CHECK_CAST( obj, ctype, ptype )         ((ptype *) camel_object_check_cast( (CamelObject *)(obj), (CamelType)(ctype) ))
-#define CAMEL_CHECK_CLASS_CAST( class, ctype, ptype ) ((ptype *) camel_object_class_check_cast( (CamelObjectClass *)(class), (CamelType)(ctype) ))
+#define CAMEL_CHECK_CLASS_CAST( klass, ctype, ptype ) ((ptype *) camel_object_class_check_cast( (CamelObjectClass *)(klass), (CamelType)(ctype) ))
 #define CAMEL_CHECK_TYPE( obj, ctype )                (camel_object_is_of_type( (CamelObject *)(obj), (CamelType)(ctype) ))
-#define CAMEL_CHECK_CLASS_TYPE( class, ctype )        (camel_object_class_is_of_type( (CamelObjectClass *)(class), (CamelType)(ctype) ))
+#define CAMEL_CHECK_CLASS_TYPE( klass, ctype )        (camel_object_class_is_of_type( (CamelObjectClass *)(klass), (CamelType)(ctype) ))
 #endif
 
 #define CAMEL_INVALID_TYPE ((CamelType)0)
@@ -124,26 +124,25 @@ void camel_object_unref (CamelObject *obj);
 #define camel_object_unref(o) (printf("%s (%s:%d):unref (%p)\n", __FUNCTION__, __FILE__, __LINE__, o), camel_object_unref (o))
 #endif
 
-CamelObject *camel_object_check_cast (CamelObject * obj,
+CamelObject *camel_object_check_cast (CamelObject *obj,
 				      CamelType ctype);
-CamelObjectClass *camel_object_class_check_cast (CamelObjectClass *
-						 class,
+CamelObjectClass *camel_object_class_check_cast (CamelObjectClass *klass,
 						 CamelType ctype);
-gboolean camel_object_is_of_type (CamelObject * obj, CamelType ctype);
-gboolean camel_object_class_is_of_type (CamelObjectClass * class,
+gboolean camel_object_is_of_type (CamelObject *obj, CamelType ctype);
+gboolean camel_object_class_is_of_type (CamelObjectClass *klass,
 					CamelType ctype);
-gchar *camel_object_describe (CamelObject * obj);
-void camel_object_class_declare_event (CamelObjectClass * class,
-				       const gchar * name,
+gchar *camel_object_describe (CamelObject *obj);
+void camel_object_class_declare_event (CamelObjectClass *klass,
+				       const char *name,
 				       CamelObjectEventPrepFunc prep);
-void camel_object_hook_event (CamelObject * obj, const gchar * name,
+void camel_object_hook_event (CamelObject *obj, const char * name,
 			      CamelObjectEventHookFunc hook,
 			      gpointer user_data);
-void camel_object_unhook_event (CamelObject * obj, const gchar * name,
+void camel_object_unhook_event (CamelObject *obj, const char * name,
 				CamelObjectEventHookFunc hook,
 				gpointer user_data);
-void camel_object_trigger_event (CamelObject * obj,
-				 const gchar * name,
+void camel_object_trigger_event (CamelObject *obj,
+				 const char *name,
 				 gpointer event_data);
 
 #ifdef __cplusplus
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
index ae0e49d339..afd03b9a97 100644
--- a/camel/camel-store-summary.h
+++ b/camel/camel-store-summary.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2000 Ximian Inc.
  *
@@ -18,9 +19,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _CAMEL_STORE_SUMMARY_H
 #define _CAMEL_STORE_SUMMARY_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <stdio.h>
 #include <time.h>
 #include <camel/camel-mime-parser.h>
@@ -159,4 +166,8 @@ void camel_folder_info_set_string(CamelStoreSummary *, CamelFolderInfo *, int ty
 #define camel_folder_info_uri(s, i) (camel_folder_info_string((CamelStoreSummary *)s, (const CamelFolderInfo *)i, CAMEL_STORE_SUMMARY_URI))
 #define camel_folder_info_name(s, i) (camel_folder_info_string((CamelStoreSummary *)s, (const CamelFolderInfo *)i, CAMEL_STORE_SUMMARY_NAME))
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_STORE_SUMMARY_H */
diff --git a/camel/camel-stream-filter.h b/camel/camel-stream-filter.h
index 3f50c211b6..ae50e016c3 100644
--- a/camel/camel-stream-filter.h
+++ b/camel/camel-stream-filter.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -18,9 +19,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _CAMEL_STREAM_FILTER_H
 #define _CAMEL_STREAM_FILTER_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-stream.h>
 #include <camel/camel-mime-filter.h>
 
@@ -49,4 +56,8 @@ CamelStreamFilter      *camel_stream_filter_new_with_stream	(CamelStream *stream
 int camel_stream_filter_add	(CamelStreamFilter *filter, CamelMimeFilter *);
 void camel_stream_filter_remove	(CamelStreamFilter *filter, int id);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_STREAM_FILTER_H */
diff --git a/camel/camel-stream-null.h b/camel/camel-stream-null.h
index 4618d157ed..f2e1c26ccc 100644
--- a/camel/camel-stream-null.h
+++ b/camel/camel-stream-null.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -18,9 +19,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _CAMEL_STREAM_NULL_H
 #define _CAMEL_STREAM_NULL_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-stream.h>
 
 #define CAMEL_STREAM_NULL(obj)         CAMEL_CHECK_CAST (obj, camel_stream_null_get_type (), CamelStreamNull)
@@ -43,4 +50,8 @@ guint			camel_stream_null_get_type	(void);
 
 CamelStream            *camel_stream_null_new		(void);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_STREAM_NULL_H */
diff --git a/camel/camel-vee-folder.h b/camel/camel-vee-folder.h
index e148bcccc4..c461d80a7e 100644
--- a/camel/camel-vee-folder.h
+++ b/camel/camel-vee-folder.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -18,9 +19,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _CAMEL_VEE_FOLDER_H
 #define _CAMEL_VEE_FOLDER_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <glib.h>
 #include <camel/camel-folder.h>
 
@@ -68,4 +75,8 @@ void	     camel_vee_folder_set_expression	(CamelVeeFolder *vf, const char *expr)
 
 void	     camel_vee_folder_hash_folder	(CamelFolder *folder, char buffer[8]);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_VEE_FOLDER_H */
diff --git a/camel/camel-vee-store.h b/camel/camel-vee-store.h
index c3c48580eb..974bca5bd3 100644
--- a/camel/camel-vee-store.h
+++ b/camel/camel-vee-store.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Copyright (C) 2000 Ximian Inc.
  *
@@ -18,9 +19,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+
 #ifndef _CAMEL_VEE_STORE_H
 #define _CAMEL_VEE_STORE_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <glib.h>
 #include <camel/camel-store.h>
 
@@ -47,4 +54,8 @@ struct _CamelVeeStoreClass {
 guint		camel_vee_store_get_type	(void);
 CamelVeeStore      *camel_vee_store_new	(void);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_VEE_STORE_H */
diff --git a/camel/camel-vtrash-folder.h b/camel/camel-vtrash-folder.h
index acacc49082..f0441c4c82 100644
--- a/camel/camel-vtrash-folder.h
+++ b/camel/camel-vtrash-folder.h
@@ -24,6 +24,11 @@
 #ifndef _CAMEL_VTRASH_FOLDER_H
 #define _CAMEL_VTRASH_FOLDER_H
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #include <camel/camel-folder.h>
 #include <camel/camel-vee-folder.h>
 
@@ -50,4 +55,8 @@ CamelType       camel_vtrash_folder_get_type    (void);
 
 CamelFolder    *camel_vtrash_folder_new		(CamelStore *parent_store, const char *name);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* ! _CAMEL_VTRASH_FOLDER_H */