GNOME.org
 

[evolution-data-server] Use G_BEGIN_DECLS / G_END_DECLS macros.

commit 3eb70ba0c0d531b554435e87f041a534ef55e5ea
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Jun 18 12:14:58 2009 -0400

    Use G_BEGIN_DECLS / G_END_DECLS macros.

 camel/camel-net-utils-win32.h                      |    8 ++------
 libedataserver/e-iconv.h                           |    9 ++-------
 libedataserver/e-trie.h                            |   11 +++--------
 servers/exchange/lib/e2k-action.h                  |    9 ++-------
 servers/exchange/lib/e2k-autoconfig.h              |    9 ++-------
 servers/exchange/lib/e2k-context.h                 |    9 ++-------
 servers/exchange/lib/e2k-freebusy.h                |    9 ++-------
 servers/exchange/lib/e2k-global-catalog-ldap.h     |    9 ++-------
 servers/exchange/lib/e2k-global-catalog.h          |    9 ++-------
 servers/exchange/lib/e2k-http-utils.h              |    4 +---
 servers/exchange/lib/e2k-kerberos.h                |    9 ++-------
 servers/exchange/lib/e2k-operation.h               |    9 ++-------
 servers/exchange/lib/e2k-restriction.h             |    9 ++-------
 servers/exchange/lib/e2k-validate.h                |    9 ++-------
 servers/exchange/lib/mapi.h                        |    9 ++-------
 servers/exchange/storage/e-folder-exchange.h       |    9 ++-------
 servers/exchange/storage/e-folder-type-registry.h  |    9 ++-------
 servers/exchange/storage/e-folder.h                |    9 ++-------
 servers/exchange/storage/e-storage.h               |    9 ++-------
 servers/exchange/storage/exchange-account.h        |    9 ++-------
 servers/exchange/storage/exchange-esource.h        |    9 ++-------
 servers/exchange/storage/exchange-folder-size.h    |    9 ++-------
 .../storage/exchange-hierarchy-favorites.h         |    9 ++-------
 .../exchange/storage/exchange-hierarchy-foreign.h  |    9 ++-------
 servers/exchange/storage/exchange-hierarchy-gal.h  |    9 ++-------
 .../exchange/storage/exchange-hierarchy-somedav.h  |    9 ++-------
 .../exchange/storage/exchange-hierarchy-webdav.h   |    9 ++-------
 servers/exchange/storage/exchange-hierarchy.h      |    9 ++-------
 servers/exchange/storage/exchange-oof.h            |    9 ++-------
 servers/exchange/storage/exchange-types.h          |    4 +---
 30 files changed, 59 insertions(+), 202 deletions(-)
---
diff --git a/camel/camel-net-utils-win32.h b/camel/camel-net-utils-win32.h
index 58cdc38..a4f21f5 100644
--- a/camel/camel-net-utils-win32.h
+++ b/camel/camel-net-utils-win32.h
@@ -37,9 +37,7 @@ typedef int (WINAPI *COMPAT_PGETADDRINFO)(const char *nodename,const char *servn
 typedef int (WINAPI *COMPAT_PGETNAMEINFO)(const struct sockaddr *sa,socklen_t salen,char *host,size_t hostlen,char *serv,size_t servlen,int flags);
 typedef void (WINAPI *COMPAT_PFREEADDRINFO)(struct addrinfo *ai);
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
   static char *WINAPI CompatStrdup (const char *pszString) {
     char *pszMemory;
@@ -379,7 +377,5 @@ extern "C" {
     (*pfFreeAddrInfo)(ai);
   }
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 #endif
diff --git a/libedataserver/e-iconv.h b/libedataserver/e-iconv.h
index 5b3de40..d204836 100644
--- a/libedataserver/e-iconv.h
+++ b/libedataserver/e-iconv.h
@@ -31,10 +31,7 @@
 
 #include <iconv.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 const gchar *e_iconv_charset_name(const gchar *charset);
 iconv_t e_iconv_open(const gchar *oto, const gchar *ofrom);
@@ -46,9 +43,7 @@ const gchar *e_iconv_locale_charset(void);
 const gchar *e_iconv_locale_language (void);
 const gchar *e_iconv_charset_language (const gchar *charset);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* EDS_DISABLE_DEPRECATED */
 
diff --git a/libedataserver/e-trie.h b/libedataserver/e-trie.h
index 2a534fc..f285562 100644
--- a/libedataserver/e-trie.h
+++ b/libedataserver/e-trie.h
@@ -27,13 +27,10 @@
 
 #ifndef EDS_DISABLE_DEPRECATED
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 typedef struct _ETrie ETrie;
 
 ETrie *e_trie_new (gboolean icase);
@@ -43,9 +40,7 @@ void e_trie_add (ETrie *trie, const gchar *pattern, gint pattern_id);
 
 const gchar *e_trie_search (ETrie *trie, const gchar *buffer, gsize buflen, gint *matched_id);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* EDS_DISABLE_DEPRECATED */
 
diff --git a/servers/exchange/lib/e2k-action.h b/servers/exchange/lib/e2k-action.h
index d82d5b2..1679f51 100644
--- a/servers/exchange/lib/e2k-action.h
+++ b/servers/exchange/lib/e2k-action.h
@@ -8,10 +8,7 @@
 #include "e2k-properties.h"
 #include "e2k-rule.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 gboolean     e2k_actions_extract       (guint8		    **data,
 					gint		     *len,
@@ -52,8 +49,6 @@ void         e2k_addr_list_set_oneoff  (E2kAddrList	     *list,
 					const gchar	     *email);
 void         e2k_addr_list_free        (E2kAddrList	     *list);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __E2K_ACTION_H__ */
diff --git a/servers/exchange/lib/e2k-autoconfig.h b/servers/exchange/lib/e2k-autoconfig.h
index d922b32..a211ee8 100644
--- a/servers/exchange/lib/e2k-autoconfig.h
+++ b/servers/exchange/lib/e2k-autoconfig.h
@@ -8,10 +8,7 @@
 #include "e2k-operation.h"
 #include "e2k-validate.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef enum {
 	E2K_EXCHANGE_UNKNOWN,
@@ -80,8 +77,6 @@ E2kAutoconfigResult  e2k_autoconfig_check_global_catalog (E2kAutoconfig *ac,
 
 const gchar          *e2k_autoconfig_lookup_option        (const gchar *option);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_AUTOCONFIG_H__ */
diff --git a/servers/exchange/lib/e2k-context.h b/servers/exchange/lib/e2k-context.h
index 7fc815e..ddc36b5 100644
--- a/servers/exchange/lib/e2k-context.h
+++ b/servers/exchange/lib/e2k-context.h
@@ -15,10 +15,7 @@
 #include "e2k-http-utils.h"
 #include "e2k-result.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E2K_TYPE_CONTEXT            (e2k_context_get_type ())
 #define E2K_CONTEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E2K_TYPE_CONTEXT, E2kContext))
@@ -212,8 +209,6 @@ E2kHTTPStatus  e2k_context_send_message  (E2kContext *ctx,
 					  E2kOperation *op,
 					  SoupMessage *msg);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __E2K_CONTEXT_H__ */
diff --git a/servers/exchange/lib/e2k-freebusy.h b/servers/exchange/lib/e2k-freebusy.h
index cc9ca4d..67e5341 100644
--- a/servers/exchange/lib/e2k-freebusy.h
+++ b/servers/exchange/lib/e2k-freebusy.h
@@ -6,10 +6,7 @@
 
 #include "e2k-context.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef enum {
 	E2K_BUSYSTATUS_FREE = 0,
@@ -62,8 +59,6 @@ E2kHTTPStatus  e2k_freebusy_save                  (E2kFreebusy     *fb);
 
 void           e2k_freebusy_destroy               (E2kFreebusy     *fb);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __E2K_FREEBUSY_H__ */
diff --git a/servers/exchange/lib/e2k-global-catalog-ldap.h b/servers/exchange/lib/e2k-global-catalog-ldap.h
index 070f2ac..39d5ac4 100644
--- a/servers/exchange/lib/e2k-global-catalog-ldap.h
+++ b/servers/exchange/lib/e2k-global-catalog-ldap.h
@@ -20,17 +20,12 @@
 #endif
 #include "e2k-global-catalog.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 LDAP             *e2k_global_catalog_get_ldap        (E2kGlobalCatalog *gc,
 						      E2kOperation     *op,
 						      gint              *ldap_error);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __E2K_GLOBAL_CATALOG_LDAP_H__ */
diff --git a/servers/exchange/lib/e2k-global-catalog.h b/servers/exchange/lib/e2k-global-catalog.h
index ea0c1be..abd7d98 100644
--- a/servers/exchange/lib/e2k-global-catalog.h
+++ b/servers/exchange/lib/e2k-global-catalog.h
@@ -9,10 +9,7 @@
 #include "e2k-operation.h"
 #include "e2k-validate.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E2K_TYPE_GLOBAL_CATALOG            (e2k_global_catalog_get_type ())
 #define E2K_GLOBAL_CATALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E2K_TYPE_GLOBAL_CATALOG, E2kGlobalCatalog))
@@ -117,8 +114,6 @@ E2kGlobalCatalogStatus e2k_global_catalog_remove_delegate (E2kGlobalCatalog *gc,
 							   const gchar *self_dn,
 							   const gchar *delegate_dn);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __E2K_GLOBAL_CATALOG_H__ */
diff --git a/servers/exchange/lib/e2k-http-utils.h b/servers/exchange/lib/e2k-http-utils.h
index eda30c6..76f3724 100644
--- a/servers/exchange/lib/e2k-http-utils.h
+++ b/servers/exchange/lib/e2k-http-utils.h
@@ -57,8 +57,6 @@ GSList        *e2k_http_get_headers     (SoupMessageHeaders *hdrs,
 #define E2K_HTTP_INTERNAL_SERVER_ERROR             500
 #define E2K_HTTP_BAD_GATEWAY                       502
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __E2K_HTTP_UTILS_H__ */
diff --git a/servers/exchange/lib/e2k-kerberos.h b/servers/exchange/lib/e2k-kerberos.h
index b0cba0e..fcb3229 100644
--- a/servers/exchange/lib/e2k-kerberos.h
+++ b/servers/exchange/lib/e2k-kerberos.h
@@ -4,10 +4,7 @@
 #ifndef __E2K_KERBEROS_H__
 #define __E2K_KERBEROS_H__
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef enum {
 	E2K_KERBEROS_OK,
@@ -31,8 +28,6 @@ E2kKerberosResult e2k_kerberos_change_password (const gchar *user,
 						const gchar *old_password,
 						const gchar *new_password);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __E2K_FREEBUSY_H__ */
diff --git a/servers/exchange/lib/e2k-operation.h b/servers/exchange/lib/e2k-operation.h
index ce2b92d..5979289 100644
--- a/servers/exchange/lib/e2k-operation.h
+++ b/servers/exchange/lib/e2k-operation.h
@@ -7,10 +7,7 @@
 #include <string.h>
 #include "e2k-types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef void (*E2kOperationCancelFunc) (E2kOperation *op, gpointer owner, gpointer data);
 
@@ -37,8 +34,6 @@ void     e2k_operation_finish         (E2kOperation           *op);
 void     e2k_operation_cancel         (E2kOperation           *op);
 gboolean e2k_operation_is_cancelled   (E2kOperation           *op);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __E2k_OPERATION_H__ */
diff --git a/servers/exchange/lib/e2k-restriction.h b/servers/exchange/lib/e2k-restriction.h
index cdce468..a725641 100644
--- a/servers/exchange/lib/e2k-restriction.h
+++ b/servers/exchange/lib/e2k-restriction.h
@@ -6,10 +6,7 @@
 
 #include "e2k-types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef enum {
 	E2K_RELOP_LT = 0,
@@ -95,8 +92,6 @@ gboolean        e2k_restriction_extract     (guint8              **data,
 void            e2k_restriction_append      (GByteArray           *ba,
 					     E2kRestriction       *rn);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __E2K_RESTRICTION_H__ */
diff --git a/servers/exchange/lib/e2k-validate.h b/servers/exchange/lib/e2k-validate.h
index 8d80ecc..cb13921 100644
--- a/servers/exchange/lib/e2k-validate.h
+++ b/servers/exchange/lib/e2k-validate.h
@@ -6,10 +6,7 @@
 
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef enum {
 	E2K_AUTOCONFIG_USE_GAL_DEFAULT, /* try ntlm if available and then basic if not or failed */
@@ -54,8 +51,6 @@ gboolean e2k_validate_user (const gchar *owa_url, gchar *key, gchar **user,
 			    GtkWindow *parent);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_VALIDATE_H_ */
diff --git a/servers/exchange/lib/mapi.h b/servers/exchange/lib/mapi.h
index de374a9..e9188f6 100644
--- a/servers/exchange/lib/mapi.h
+++ b/servers/exchange/lib/mapi.h
@@ -4,10 +4,7 @@
 #ifndef __MAPI_H__
 #define __MAPI_H__
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef enum {
 	MAPI_ACCESS_MODIFY            = (1 << 0),
@@ -120,8 +117,6 @@ typedef enum {
 	MAPI_IMPORTANCE_HIGH   = 2
 } MapiPrImportance;
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __MAPI_H__ */
diff --git a/servers/exchange/storage/e-folder-exchange.h b/servers/exchange/storage/e-folder-exchange.h
index 7cb61d2..3c703cb 100644
--- a/servers/exchange/storage/e-folder-exchange.h
+++ b/servers/exchange/storage/e-folder-exchange.h
@@ -8,10 +8,7 @@
 #include "exchange-types.h"
 #include "e2k-context.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_FOLDER_EXCHANGE            (e_folder_exchange_get_type ())
 #define E_FOLDER_EXCHANGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_FOLDER_EXCHANGE, EFolderExchange))
@@ -155,8 +152,6 @@ E2kHTTPStatus  e_folder_exchange_transfer_dir      (EFolder *source,
 						    gchar **permanent_url);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __E_FOLDER_EXCHANGE_H__ */
diff --git a/servers/exchange/storage/e-folder-type-registry.h b/servers/exchange/storage/e-folder-type-registry.h
index eab0097..9f83d04 100644
--- a/servers/exchange/storage/e-folder-type-registry.h
+++ b/servers/exchange/storage/e-folder-type-registry.h
@@ -26,10 +26,7 @@
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_FOLDER_TYPE_REGISTRY		(e_folder_type_registry_get_type ())
 #define E_FOLDER_TYPE_REGISTRY(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_FOLDER_TYPE_REGISTRY, EFolderTypeRegistry))
@@ -88,8 +85,6 @@ GList *e_folder_type_registry_get_accepted_dnd_types_for_type (EFolderTypeRegist
 							       const gchar *type_name);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_FOLDER_TYPE_REGISTRY_H_ */
diff --git a/servers/exchange/storage/e-folder.h b/servers/exchange/storage/e-folder.h
index 2107f3d..449e5ed 100644
--- a/servers/exchange/storage/e-folder.h
+++ b/servers/exchange/storage/e-folder.h
@@ -26,10 +26,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_FOLDER			(e_folder_get_type ())
 #define E_FOLDER(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_FOLDER, EFolder))
@@ -98,8 +95,6 @@ void  e_folder_set_sorting_priority  (EFolder *folder, gint sorting_priority);
 gboolean e_folder_accept_drop        (EFolder *folder, GdkDragContext *context,
 				      const gchar *target_type,
 				      GtkSelectionData *selection_data);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_FOLDER_H_ */
diff --git a/servers/exchange/storage/e-storage.h b/servers/exchange/storage/e-storage.h
index b960f74..78a449d 100644
--- a/servers/exchange/storage/e-storage.h
+++ b/servers/exchange/storage/e-storage.h
@@ -26,10 +26,7 @@
 #include <glib-object.h>
 #include "e-folder.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_STORAGE			(e_storage_get_type ())
 #define E_STORAGE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_STORAGE, EStorage))
@@ -206,8 +203,6 @@ gboolean e_storage_declare_has_subfolders (EStorage   *storage,
 gboolean e_storage_get_has_subfolders     (EStorage   *storage,
 					   const gchar *path);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_STORAGE_H_ */
diff --git a/servers/exchange/storage/exchange-account.h b/servers/exchange/storage/exchange-account.h
index 4ef7467..9a6a209 100644
--- a/servers/exchange/storage/exchange-account.h
+++ b/servers/exchange/storage/exchange-account.h
@@ -14,10 +14,7 @@
 #include <libedataserver/e-account-list.h>
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EXCHANGE_TYPE_ACCOUNT            (exchange_account_get_type ())
 #define EXCHANGE_ACCOUNT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_ACCOUNT, ExchangeAccount))
@@ -202,8 +199,6 @@ void			exchange_account_scan_foreign_hierarchy (ExchangeAccount *account,
 							      const gchar *user_email);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_ACCOUNT_H__ */
diff --git a/servers/exchange/storage/exchange-esource.h b/servers/exchange/storage/exchange-esource.h
index 02c8a6c..755a057 100644
--- a/servers/exchange/storage/exchange-esource.h
+++ b/servers/exchange/storage/exchange-esource.h
@@ -7,10 +7,7 @@
 #include "exchange-constants.h"
 #include "exchange-account.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define CONF_KEY_SELECTED_CAL_SOURCES "/apps/evolution/calendar/display/selected_calendars"
 #define CONF_KEY_SELECTED_TASKS_SOURCES "/apps/evolution/calendar/tasks/selected_tasks"
@@ -22,8 +19,6 @@ extern "C" {
 void			add_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *folder_name, const gchar *physical_uri);
 void			remove_folder_esource (ExchangeAccount *account, FolderType folder_type, const gchar *physical_uri);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_ESOURCE_H__ */
diff --git a/servers/exchange/storage/exchange-folder-size.h b/servers/exchange/storage/exchange-folder-size.h
index 37c9f38..6b89f37 100644
--- a/servers/exchange/storage/exchange-folder-size.h
+++ b/servers/exchange/storage/exchange-folder-size.h
@@ -8,10 +8,7 @@
 #include "e2k-security-descriptor.h"
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EXCHANGE_TYPE_FOLDER_SIZE			(exchange_folder_size_get_type ())
 #define EXCHANGE_FOLDER_SIZE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_FOLDER_SIZE, ExchangeFolderSize))
@@ -48,8 +45,6 @@ gdouble exchange_folder_size_get (ExchangeFolderSize *fsize, const gchar *folder
 
 GtkListStore *exchange_folder_size_get_model (ExchangeFolderSize *fsize);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_FOLDER_SIZE_H__ */
diff --git a/servers/exchange/storage/exchange-hierarchy-favorites.h b/servers/exchange/storage/exchange-hierarchy-favorites.h
index a513ea8..798f287 100644
--- a/servers/exchange/storage/exchange-hierarchy-favorites.h
+++ b/servers/exchange/storage/exchange-hierarchy-favorites.h
@@ -6,10 +6,7 @@
 
 #include "exchange-hierarchy-somedav.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EXCHANGE_TYPE_HIERARCHY_FAVORITES            (exchange_hierarchy_favorites_get_type ())
 #define EXCHANGE_HIERARCHY_FAVORITES(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_HIERARCHY_FAVORITES, ExchangeHierarchyFavorites))
@@ -45,8 +42,6 @@ ExchangeAccountFolderResult  exchange_hierarchy_favorites_add_folder (ExchangeHi
 gboolean exchange_hierarchy_favorites_is_added (ExchangeHierarchy *hier,
 						EFolder *folder);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_HIERARCHY_FAVORITES_H__ */
diff --git a/servers/exchange/storage/exchange-hierarchy-foreign.h b/servers/exchange/storage/exchange-hierarchy-foreign.h
index bb950ab..eee2ee9 100644
--- a/servers/exchange/storage/exchange-hierarchy-foreign.h
+++ b/servers/exchange/storage/exchange-hierarchy-foreign.h
@@ -6,10 +6,7 @@
 
 #include "exchange-hierarchy-somedav.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EXCHANGE_TYPE_HIERARCHY_FOREIGN            (exchange_hierarchy_foreign_get_type ())
 #define EXCHANGE_HIERARCHY_FOREIGN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_HIERARCHY_FOREIGN, ExchangeHierarchyForeign))
@@ -49,8 +46,6 @@ ExchangeAccountFolderResult  exchange_hierarchy_foreign_add_folder (ExchangeHier
 								    const gchar *folder_name,
 								    EFolder **folder);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_HIERARCHY_FOREIGN_H__ */
diff --git a/servers/exchange/storage/exchange-hierarchy-gal.h b/servers/exchange/storage/exchange-hierarchy-gal.h
index 7d00496..bcc2fe9 100644
--- a/servers/exchange/storage/exchange-hierarchy-gal.h
+++ b/servers/exchange/storage/exchange-hierarchy-gal.h
@@ -6,10 +6,7 @@
 
 #include "exchange-hierarchy.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EXCHANGE_TYPE_HIERARCHY_GAL            (exchange_hierarchy_gal_get_type ())
 #define EXCHANGE_HIERARCHY_GAL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_HIERARCHY_GAL, ExchangeHierarchyGAL))
@@ -33,8 +30,6 @@ ExchangeHierarchy    *exchange_hierarchy_gal_new      (ExchangeAccount *account,
 						       const gchar *hierarchy_name,
 						       const gchar *physical_uri_prefix);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_HIERARCHY_GAL_H__ */
diff --git a/servers/exchange/storage/exchange-hierarchy-somedav.h b/servers/exchange/storage/exchange-hierarchy-somedav.h
index 4adc3d6..b8ba4ee 100644
--- a/servers/exchange/storage/exchange-hierarchy-somedav.h
+++ b/servers/exchange/storage/exchange-hierarchy-somedav.h
@@ -6,10 +6,7 @@
 
 #include "exchange-hierarchy-webdav.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EXCHANGE_TYPE_HIERARCHY_SOMEDAV            (exchange_hierarchy_somedav_get_type ())
 #define EXCHANGE_HIERARCHY_SOMEDAV(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_HIERARCHY_SOMEDAV, ExchangeHierarchySomeDAV))
@@ -45,8 +42,6 @@ ExchangeAccountFolderResult exchange_hierarchy_somedav_add_folder (ExchangeHiera
 void exchange_hierarchy_somedav_href_unreadable (ExchangeHierarchySomeDAV *hsd,
 						 const gchar *href);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_HIERARCHY_SOMEDAV_H__ */
diff --git a/servers/exchange/storage/exchange-hierarchy-webdav.h b/servers/exchange/storage/exchange-hierarchy-webdav.h
index ec670f1..987ccd3 100644
--- a/servers/exchange/storage/exchange-hierarchy-webdav.h
+++ b/servers/exchange/storage/exchange-hierarchy-webdav.h
@@ -7,10 +7,7 @@
 #include "exchange-hierarchy.h"
 /* #include "exchange-folder-size.h" */
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EXCHANGE_TYPE_HIERARCHY_WEBDAV            (exchange_hierarchy_webdav_get_type ())
 #define EXCHANGE_HIERARCHY_WEBDAV(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_HIERARCHY_WEBDAV, ExchangeHierarchyWebDAV))
@@ -68,8 +65,6 @@ void    exchange_hierarchy_webdav_offline_scan_subtree (ExchangeHierarchy *hier,
 gdouble exchange_hierarchy_webdav_get_total_folder_size (ExchangeHierarchyWebDAV *hwd);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_HIERARCHY_WEBDAV_H__ */
diff --git a/servers/exchange/storage/exchange-hierarchy.h b/servers/exchange/storage/exchange-hierarchy.h
index cae9e79..2bb9107 100644
--- a/servers/exchange/storage/exchange-hierarchy.h
+++ b/servers/exchange/storage/exchange-hierarchy.h
@@ -8,10 +8,7 @@
 #include "exchange-account.h"
 #include "e-folder.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EXCHANGE_TYPE_HIERARCHY            (exchange_hierarchy_get_type ())
 #define EXCHANGE_HIERARCHY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_HIERARCHY, ExchangeHierarchy))
@@ -99,8 +96,6 @@ ExchangeAccountFolderResult exchange_hierarchy_xfer_folder   (ExchangeHierarchy
 							      const gchar        *dest_name,
 							      gboolean           remove_source);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_HIERARCHY_H__ */
diff --git a/servers/exchange/storage/exchange-oof.h b/servers/exchange/storage/exchange-oof.h
index a05fed6..ca279be 100644
--- a/servers/exchange/storage/exchange-oof.h
+++ b/servers/exchange/storage/exchange-oof.h
@@ -7,10 +7,7 @@
 #include "exchange-types.h"
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 gboolean      exchange_oof_get              (ExchangeAccount  *account,
 					     gboolean         *oof,
@@ -19,8 +16,6 @@ gboolean      exchange_oof_set              (ExchangeAccount  *account,
 					     gboolean          oof,
 					     const gchar       *msg);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_OOF_H__ */
diff --git a/servers/exchange/storage/exchange-types.h b/servers/exchange/storage/exchange-types.h
index c930100..cfb1556 100644
--- a/servers/exchange/storage/exchange-types.h
+++ b/servers/exchange/storage/exchange-types.h
@@ -61,8 +61,6 @@ typedef enum {
 	EXCHANGE_HIERARCHY_FOREIGN
 } ExchangeHierarchyType;
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_TYPES_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]