Use G_BEGIN_DECLS / G_END_DECLS macros.

15 files changed, 30 insertions, 105 deletions

diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h
index 4567f36cbe..01d9dbd221 100644
--- a/mail/em-account-editor.h
+++ b/mail/em-account-editor.h
@@ -26,10 +26,7 @@
 
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 struct _EAccount;
 
@@ -83,8 +80,6 @@ void em_account_editor_build_extra_conf (EMAccountEditor *gui, const gchar *url)
 
 void em_account_editor_auto_detect_extra_conf (EMAccountEditor *gui);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* EM_ACCOUNT_EDITOR_H */
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index 176bdb4fc0..31d3d507da 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -26,10 +26,7 @@
 
 #include <glib.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 struct _CamelFolder;
 struct _CamelMimeMessage;
@@ -79,8 +76,6 @@ struct _EDestination ** em_utils_camel_address_to_destination (struct _CamelInte
 
 void em_configure_new_composer (struct _EMsgComposer *composer);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EM_COMPOSER_UTILS_H__ */
diff --git a/mail/em-config.h b/mail/em-config.h
index 4ebfa05ad1..b2d3bde691 100644
--- a/mail/em-config.h
+++ b/mail/em-config.h
@@ -27,10 +27,7 @@
 
 #include "e-util/e-config.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 struct _GConfClient;
 
@@ -107,8 +104,6 @@ struct _EMConfigHookClass {
 
 GType em_config_hook_get_type(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EM_CONFIG_H__ */
diff --git a/mail/em-event.h b/mail/em-event.h
index 5dc11bd910..b58a0f2cfc 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -29,10 +29,7 @@
 #include "e-util/e-event.h"
 #include "mail/em-folder-browser.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 struct _CamelFolder;
 struct _CamelMimeMessage;
@@ -177,8 +174,6 @@ struct _EMEventHookClass {
 
 GType em_event_hook_get_type(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EM_EVENT_H__ */
diff --git a/mail/em-folder-browser.h b/mail/em-folder-browser.h
index e2c74ecf17..966d3a3c13 100644
--- a/mail/em-folder-browser.h
+++ b/mail/em-folder-browser.h
@@ -26,10 +26,7 @@
 
 #include "mail/em-folder-view.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _EMFolderBrowser EMFolderBrowser;
 typedef struct _EMFolderBrowserClass EMFolderBrowserClass;
@@ -60,8 +57,6 @@ void em_folder_browser_show_wide(EMFolderBrowser *emfv, gboolean state);
 gboolean em_folder_browser_get_wide(EMFolderBrowser *emfv);
 void em_folder_browser_suppress_message_selection(EMFolderBrowser *emfb);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* ! _EM_FOLDER_BROWSER_H */
diff --git a/mail/em-format-hook.h b/mail/em-format-hook.h
index f2b5b8f387..07e6aec24a 100644
--- a/mail/em-format-hook.h
+++ b/mail/em-format-hook.h
@@ -30,10 +30,7 @@
 
 #include "em-format/em-format.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _EMFormatHookItem EMFormatHookItem;
 typedef struct _EMFormatHookGroup EMFormatHookGroup;
@@ -91,8 +88,6 @@ GType em_format_hook_get_type(void);
 /* register a type as a possible formatter hook point */
 void em_format_hook_register_type(GType type);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EM_FORMAT_HOOK_H__ */
diff --git a/mail/em-icon-stream.h b/mail/em-icon-stream.h
index 24f4acedc1..17d4246059 100644
--- a/mail/em-icon-stream.h
+++ b/mail/em-icon-stream.h
@@ -23,10 +23,7 @@
 #ifndef EM_ICON_STREAM_H
 #define EM_ICON_STREAM_H
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EM_ICON_STREAM_TYPE     (em_icon_stream_get_type ())
 #define EM_ICON_STREAM(obj)     (CAMEL_CHECK_CAST((obj), EM_ICON_STREAM_TYPE, EMIconStream))
@@ -62,8 +59,6 @@ gint em_icon_stream_is_resized(const gchar *key, guint maxwidth, guint maxheight
 
 void em_icon_stream_clear_cache(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* EM_ICON_STREAM_H */
diff --git a/mail/em-inline-filter.h b/mail/em-inline-filter.h
index ed5b688dfb..2a7a18b4d4 100644
--- a/mail/em-inline-filter.h
+++ b/mail/em-inline-filter.h
@@ -24,10 +24,7 @@
 #ifndef EM_INLINE_FILTER_H
 #define EM_INLINE_FILTER_H
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EM_INLINE_FILTER_TYPE     (em_inline_filter_get_type ())
 #define EM_INLINE_FILTER(obj)     (CAMEL_CHECK_CAST((obj), EM_INLINE_FILTER_TYPE, EMInlineFilter))
@@ -58,8 +55,6 @@ CamelType    em_inline_filter_get_type(void);
 EMInlineFilter *em_inline_filter_new(CamelTransferEncoding base_encoding, CamelContentType *type);
 struct _CamelMultipart *em_inline_filter_get_multipart(EMInlineFilter *emif);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* EM_INLINE_FILTER_H */
diff --git a/mail/em-junk-hook.h b/mail/em-junk-hook.h
index 9e7c999b29..1f66518e96 100644
--- a/mail/em-junk-hook.h
+++ b/mail/em-junk-hook.h
@@ -28,10 +28,7 @@
 
 #include <camel/camel-junk-plugin.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _EMJunkHookItem EMJunkHookItem;
 typedef struct _EMJunkHookGroup EMJunkHookGroup;
@@ -99,8 +96,6 @@ struct _EMJunkClass {
 
 GType emj_get_type(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EM_JUNK_HOOK_H__ */
diff --git a/mail/em-menu.h b/mail/em-menu.h
index 96f571407c..3e7ca19aed 100644
--- a/mail/em-menu.h
+++ b/mail/em-menu.h
@@ -28,10 +28,7 @@
 
 #include "e-util/e-menu.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _EMMenu EMMenu;
 typedef struct _EMMenuClass EMMenuClass;
@@ -118,8 +115,6 @@ struct _EMMenuHookClass {
 
 GType em_menu_hook_get_type(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EM_MENU_H__ */
diff --git a/mail/em-popup.h b/mail/em-popup.h
index dea4aee5d2..cdac00becc 100644
--- a/mail/em-popup.h
+++ b/mail/em-popup.h
@@ -28,10 +28,7 @@
 
 #include "e-util/e-popup.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _EMPopup EMPopup;
 typedef struct _EMPopupClass EMPopupClass;
@@ -258,8 +255,6 @@ struct _EMPopupHookClass {
 
 GType em_popup_hook_get_type(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EM_POPUP_H__ */
diff --git a/mail/mail-ops.h b/mail/mail-ops.h
index 2fc570ca93..3233f03219 100644
--- a/mail/mail-ops.h
+++ b/mail/mail-ops.h
@@ -24,10 +24,7 @@
 #ifndef MAIL_OPS_H
 #define MAIL_OPS_H
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #include "mail-mt.h"
 
@@ -169,8 +166,6 @@ void mail_execute_shell_command (CamelFilterDriver *driver, gint argc, gchar **a
 gint mail_check_service(const gchar *url, CamelProviderType type,
 		       void (*done)(const gchar *url, CamelProviderType type, GList *authtypes, gpointer data), gpointer data);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* MAIL_OPS_H */
diff --git a/mail/message-list.h b/mail/message-list.h
index 6c5dcf60cb..15ea286970 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -31,10 +31,7 @@
 #include <camel/camel-folder.h>
 #include <shell/e-shell-backend.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define MESSAGE_LIST_TYPE        (message_list_get_type ())
 #define MESSAGE_LIST(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), MESSAGE_LIST_TYPE, MessageList))
@@ -246,8 +243,6 @@ void           message_list_set_scrollbar_position (MessageList *ml, double pos)
 #define MESSAGE_LIST_LOCK(m, l) g_mutex_lock(((MessageList *)m)->l)
 #define MESSAGE_LIST_UNLOCK(m, l) g_mutex_unlock(((MessageList *)m)->l)
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _MESSAGE_LIST_H_ */
diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h
index 5193ac2103..3b097c190c 100644
--- a/mail/message-tag-editor.h
+++ b/mail/message-tag-editor.h
@@ -28,10 +28,7 @@
 #include <camel/camel-folder.h>
 #include <camel/camel-folder-summary.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define MESSAGE_TAG_EDITOR_TYPE            (message_tag_editor_get_type ())
 #define MESSAGE_TAG_EDITOR(obj)		   (G_TYPE_CHECK_INSTANCE_CAST (obj, MESSAGE_TAG_EDITOR_TYPE, MessageTagEditor))
@@ -65,8 +62,6 @@ GType message_tag_editor_get_type (void);
 CamelTag *message_tag_editor_get_tag_list (MessageTagEditor *editor);
 void      message_tag_editor_set_tag_list (MessageTagEditor *editor, CamelTag *tags);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __MESSAGE_TAG_EDITOR_H__ */
diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h
index 7e362df300..bc8c793eff 100644
--- a/mail/message-tag-followup.h
+++ b/mail/message-tag-followup.h
@@ -27,10 +27,7 @@
 #include <mail/message-tag-editor.h>
 #include <time.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define MESSAGE_TAG_FOLLOWUP_TYPE            (message_tag_followup_get_type ())
 #define MESSAGE_TAG_FOLLOWUP(obj)	     (G_TYPE_CHECK_INSTANCE_CAST (obj, MESSAGE_TAG_FOLLOWUP_TYPE, MessageTagFollowUp))
@@ -72,8 +69,6 @@ void message_tag_followup_append_message (MessageTagFollowUp *editor,
 					  const gchar *from,
 					  const gchar *subject);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __MESSAGE_TAG_FOLLOWUP_H__ */