diff options
Diffstat (limited to 'mail')
32 files changed, 68 insertions, 228 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-account-prefs.h b/mail/em-account-prefs.h index 0dabc8a11a..9539661abe 100644 --- a/mail/em-account-prefs.h +++ b/mail/em-account-prefs.h @@ -33,10 +33,7 @@ #include <shell/Evolution.h> -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define EM_ACCOUNT_PREFS_TYPE (em_account_prefs_get_type ()) @@ -84,8 +81,6 @@ GtkWidget *em_account_prefs_new (GNOME_Evolution_Shell shell); /* needed by global config */ #define EM_ACCOUNT_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_AccountPrefs_ConfigControl:" BASE_VERSION -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* __EM_ACCOUNT_PREFS_H__ */ diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index ab4a86368e..3ba3c5e23f 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; @@ -85,8 +82,6 @@ void em_utils_get_reply_all (struct _CamelMimeMessage *message, struct _CamelInt struct _EMsgComposer * em_utils_reply_to_message (struct _CamelFolder *, const gchar *uid, struct _CamelMimeMessage *message, gint mode, struct _EMFormat *source); struct _EDestination ** em_utils_camel_address_to_destination (struct _CamelInternetAddress *iaddr); -#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-folder-properties.h b/mail/em-folder-properties.h index cdaec27e4d..d28eefe29b 100644 --- a/mail/em-folder-properties.h +++ b/mail/em-folder-properties.h @@ -24,18 +24,13 @@ #ifndef __EM_FOLDER_PROPERTIES_H__ #define __EM_FOLDER_PROPERTIES_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS struct _CamelFolder; struct _GtkWindow; void em_folder_properties_show(struct _GtkWindow *parent, struct _CamelFolder *folder, const gchar *uri); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EM_FOLDER_PROPERTIES_H__ */ diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h index 7b2a1b471d..c04747369d 100644 --- a/mail/em-folder-selection-button.h +++ b/mail/em-folder-selection-button.h @@ -26,10 +26,7 @@ #include <gtk/gtk.h> -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define EM_TYPE_FOLDER_SELECTION_BUTTON (em_folder_selection_button_get_type ()) #define EM_FOLDER_SELECTION_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EM_TYPE_FOLDER_SELECTION_BUTTON, EMFolderSelectionButton)) @@ -68,8 +65,6 @@ GList *em_folder_selection_button_get_selection_mult (EMFolderSelectionButton *b void em_folder_selection_button_set_multiselect (EMFolderSelectionButton *button, gboolean value); gboolean em_folder_selection_button_get_multiselect (EMFolderSelectionButton *button); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EM_FOLDER_SELECTION_BUTTON_H__ */ diff --git a/mail/em-folder-selection.h b/mail/em-folder-selection.h index 098fa2b227..8a15526a64 100644 --- a/mail/em-folder-selection.h +++ b/mail/em-folder-selection.h @@ -24,10 +24,7 @@ #ifndef EM_FOLDER_SELECTION_H #define EM_FOLDER_SELECTION_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #include "em-folder-tree.h" @@ -38,8 +35,6 @@ void em_select_folder (struct _GtkWindow *parent_window, const gchar *title, con void (*done)(const gchar *uri, gpointer data), gpointer data); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* EM_FOLDER_SELECTION_H */ diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h index 563ede2787..2c2274f6c9 100644 --- a/mail/em-folder-tree-model.h +++ b/mail/em-folder-tree-model.h @@ -31,10 +31,7 @@ #include <libedataserver/e-account-list.h> -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define EM_TYPE_FOLDER_TREE_MODEL (em_folder_tree_model_get_type ()) #define EM_FOLDER_TREE_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EM_TYPE_FOLDER_TREE_MODEL, EMFolderTreeModel)) @@ -150,8 +147,6 @@ void em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelStore gboolean em_folder_tree_model_is_type_inbox (EMFolderTreeModel *model, CamelStore *store, const gchar *full); gchar * em_folder_tree_model_get_folder_name (EMFolderTreeModel *model, CamelStore *store, const gchar *full); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EM_FOLDER_TREE_MODEL_H__ */ diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h index 265616a00a..ba02ff1e59 100644 --- a/mail/em-folder-tree.h +++ b/mail/em-folder-tree.h @@ -29,10 +29,7 @@ #include "mail/em-folder-tree-model.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define EM_TYPE_FOLDER_TREE (em_folder_tree_get_type ()) #define EM_FOLDER_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EM_TYPE_FOLDER_TREE, EMFolderTree)) @@ -97,8 +94,6 @@ gboolean em_folder_tree_create_folder (EMFolderTree *emft, const gchar *full_nam GtkWidget * em_folder_tree_get_tree_view (EMFolderTree *emft); void em_folder_tree_set_skip_double_click (EMFolderTree *emft, gboolean skip); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EM_FOLDER_TREE_H__ */ diff --git a/mail/em-format-hook.h b/mail/em-format-hook.h index 553eb7adab..3f02167e58 100644 --- a/mail/em-format-hook.h +++ b/mail/em-format-hook.h @@ -30,10 +30,7 @@ #include "mail/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-html-stream.h b/mail/em-html-stream.h index 86baa5cfa6..1f832fa046 100644 --- a/mail/em-html-stream.h +++ b/mail/em-html-stream.h @@ -24,10 +24,7 @@ #ifndef EM_HTML_STREAM_H #define EM_HTML_STREAM_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define EM_HTML_STREAM_TYPE (em_html_stream_get_type ()) #define EM_HTML_STREAM(obj) (CAMEL_CHECK_CAST((obj), EM_HTML_STREAM_TYPE, EMHTMLStream)) @@ -60,8 +57,6 @@ CamelType em_html_stream_get_type (void); CamelStream *em_html_stream_new(struct _GtkHTML *html, struct _GtkHTMLStream *html_stream); void em_html_stream_set_flags (EMHTMLStream *emhs, GtkHTMLBeginFlags flags); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* EM_HTML_STREAM_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..b0af215e22 100644 --- a/mail/em-inline-filter.h +++ b/mail/em-inline-filter.h @@ -24,18 +24,15 @@ #ifndef EM_INLINE_FILTER_H #define EM_INLINE_FILTER_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +#include <camel/camel-mime-filter.h> +#include <camel/camel-mime-utils.h> #define EM_INLINE_FILTER_TYPE (em_inline_filter_get_type ()) #define EM_INLINE_FILTER(obj) (CAMEL_CHECK_CAST((obj), EM_INLINE_FILTER_TYPE, EMInlineFilter)) #define EM_INLINE_FILTER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), EM_INLINE_FILTER_TYPE, EMInlineFilterClass)) #define EM_IS_INLINE_FILTER(o) (CAMEL_CHECK_TYPE((o), EM_INLINE_FILTER_TYPE)) -#include <camel/camel-mime-filter.h> -#include <camel/camel-mime-utils.h> +G_BEGIN_DECLS typedef struct _EMInlineFilter { CamelMimeFilter filter; @@ -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-mailer-prefs.h b/mail/em-mailer-prefs.h index 917c00c932..c556951bea 100644 --- a/mail/em-mailer-prefs.h +++ b/mail/em-mailer-prefs.h @@ -23,11 +23,6 @@ #ifndef __EM_MAILER_PREFS_H__ #define __EM_MAILER_PREFS_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include <gtk/gtk.h> #include <shell/Evolution.h> @@ -51,6 +46,8 @@ struct _GtkWindow; #define EM_IS_MAILER_PREFS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EM_MAILER_PREFS_TYPE)) #define EM_IS_MAILER_PREFS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EM_MAILER_PREFS_TYPE)) +G_BEGIN_DECLS + typedef struct _EMMailerPrefs EMMailerPrefs; typedef struct _EMMailerPrefsClass EMMailerPrefsClass; typedef struct _EMMailerPrefsHeader EMMailerPrefsHeader; @@ -157,8 +154,6 @@ void em_mailer_prefs_header_free(EMMailerPrefsHeader *header); /* needed by global config */ #define EM_MAILER_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_MailerPrefs_ConfigControl:" BASE_VERSION -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EM_MAILER_PREFS_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-migrate.h b/mail/em-migrate.h index f6d43c159a..89896d4aec 100644 --- a/mail/em-migrate.h +++ b/mail/em-migrate.h @@ -25,15 +25,10 @@ #include <camel/camel-exception.h> -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS gint em_migrate (const gchar *evolution_dir, gint major, gint minor, gint revision, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EM_MIGRATE_H__ */ diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h index 3d933a7acc..79b22c5a92 100644 --- a/mail/em-network-prefs.h +++ b/mail/em-network-prefs.h @@ -23,11 +23,6 @@ #ifndef __EM_NETWORK_PREFS_H__ #define __EM_NETWORK_PREFS_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include <gtk/gtk.h> #define EM_NETWORK_PREFS_TYPE (em_network_prefs_get_type ()) @@ -36,6 +31,8 @@ extern "C" { #define EM_IS_NETWORK_PREFS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EM_NETWORK_PREFS_TYPE)) #define EM_IS_NETWORK_PREFS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EM_NETWORK_PREFS_TYPE)) +G_BEGIN_DECLS + typedef struct _EMNetworkPrefs EMNetworkPrefs; typedef struct _EMNetworkPrefsClass EMNetworkPrefsClass; @@ -109,8 +106,6 @@ struct _GtkWidget *em_network_prefs_new (void); /* needed by global config */ #define EM_NETWORK_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_NetworkPrefs_ConfigControl:" BASE_VERSION -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EM_NETWORK_PREFS_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/em-stripsig-filter.h b/mail/em-stripsig-filter.h index 761d46691f..9a09d1aab2 100644 --- a/mail/em-stripsig-filter.h +++ b/mail/em-stripsig-filter.h @@ -25,10 +25,7 @@ #include <camel/camel-mime-filter.h> -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define EM_TYPE_STRIPSIG_FILTER (em_stripsig_filter_get_type ()) #define EM_STRIPSIG_FILTER(obj) (CAMEL_CHECK_CAST ((obj), EM_TYPE_STRIPSIG_FILTER, EMStripSigFilter)) @@ -56,8 +53,6 @@ CamelType em_stripsig_filter_get_type (void); CamelMimeFilter *em_stripsig_filter_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EM_STRIPSIG_FILTER_H__ */ diff --git a/mail/em-utils.h b/mail/em-utils.h index 19a0da6788..523d350b51 100644 --- a/mail/em-utils.h +++ b/mail/em-utils.h @@ -25,10 +25,7 @@ #include <glib.h> -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #include <sys/types.h> @@ -117,8 +114,6 @@ const gchar *em_utils_snoop_type(struct _CamelMimePart *part); /* clears flag 'get_password_canceled' at every known accounts, so if needed, get_password will show dialog */ void em_utils_clear_get_password_canceled_accounts_flag (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EM_UTILS_H__ */ diff --git a/mail/mail-config-factory.h b/mail/mail-config-factory.h index 428598a663..e32d730089 100644 --- a/mail/mail-config-factory.h +++ b/mail/mail-config-factory.h @@ -23,10 +23,7 @@ #ifndef __MAIL_CONFIG_FACTORY_H__ #define __MAIL_CONFIG_FACTORY_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #include <bonobo/bonobo-generic-factory.h> #include "evolution-config-control.h" @@ -37,8 +34,6 @@ gboolean mail_config_register_factory (GNOME_Evolution_Shell shell); BonoboObject *mail_config_control_factory_cb (BonoboGenericFactory *factory, const gchar *component_id, gpointer user_data); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __MAIL_CONFIG_FACTORY_H__ */ diff --git a/mail/mail-config.h b/mail/mail-config.h index d2fef97d8e..8ebb3dc78c 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -40,10 +40,7 @@ struct _GtkWindow; struct _CamelFolder; -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS typedef struct _MailConfigSignature { gint id; @@ -166,8 +163,6 @@ GType evolution_mail_config_get_type (void); gboolean evolution_mail_config_factory_init (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* MAIL_CONFIG_H */ diff --git a/mail/mail-crypto.h b/mail/mail-crypto.h index a6ba393bf7..0ed51e3ff1 100644 --- a/mail/mail-crypto.h +++ b/mail/mail-crypto.h @@ -23,18 +23,13 @@ #ifndef MAIL_CRYPTO_H #define MAIL_CRYPTO_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS struct _EAccount; /* PGP/MIME convenience wrappers */ struct _CamelCipherContext *mail_crypto_get_pgp_cipher_context(struct _EAccount *account); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! MAIL_CRYPTO_H */ diff --git a/mail/mail-ops.h b/mail/mail-ops.h index 12e8632f88..4bc1a9b47d 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" @@ -168,8 +165,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/mail-session.h b/mail/mail-session.h index d0595ba548..aa226222d7 100644 --- a/mail/mail-session.h +++ b/mail/mail-session.h @@ -27,10 +27,7 @@ #include <bonobo/bonobo-ui-component.h> #include <camel/camel-session.h> -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS void mail_session_init (const gchar *base_directory); void mail_session_shutdown (void); @@ -57,8 +54,6 @@ void mail_session_set_junk_headers (const gchar **name, const gchar **value, gin extern CamelSession *session; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! MAIL_SESSION_H */ diff --git a/mail/mail-types.h b/mail/mail-types.h index 6acbeaf43a..c5c737eca9 100644 --- a/mail/mail-types.h +++ b/mail/mail-types.h @@ -21,10 +21,7 @@ #ifndef MAIL_TYPES_H #define MAIL_TYPES_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ +G_BEGIN_DECLS typedef struct _FolderBrowser FolderBrowser; @@ -33,8 +30,6 @@ typedef struct _SubscribeDialog SubscribeDialog; typedef struct _MessageList MessageList; typedef struct _MailDisplay MailDisplay; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* MAIL_TYPES_H */ diff --git a/mail/message-list.h b/mail/message-list.h index 04a937047a..8949b91347 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -28,10 +28,7 @@ #include <table/e-table-simple.h> #include <table/e-tree-scrolled.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)) @@ -240,8 +237,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__ */ |