GNOME.org
 

[evolution-exchange] Use G_BEGIN_DECLS / G_END_DECLS macros.

commit f4fdb7ca36488d31bb406c74691e97bcdcb11b7d
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Jun 18 13:04:07 2009 -0400

    Use G_BEGIN_DECLS / G_END_DECLS macros.

 camel/camel-exchange-folder.h        |    9 ++-------
 camel/camel-exchange-journal.h       |    9 ++-------
 camel/camel-exchange-store.h         |    9 ++-------
 camel/camel-exchange-transport.h     |    9 ++-------
 camel/camel-stub-constants.h         |    9 ++-------
 camel/camel-stub-marshal.h           |    9 ++-------
 camel/camel-stub.h                   |    9 ++-------
 mail/mail-stub-exchange.h            |    9 ++-------
 mail/mail-stub-listener.h            |    9 ++-------
 mail/mail-stub.h                     |    9 ++-------
 mail/mail-utils.h                    |   11 +++--------
 storage/exchange-autoconfig-wizard.h |    9 ++-------
 storage/exchange-change-password.h   |    9 ++-------
 storage/exchange-component.h         |    9 ++-------
 storage/exchange-config-listener.h   |    9 ++-------
 storage/exchange-storage.h           |    9 ++-------
 16 files changed, 33 insertions(+), 113 deletions(-)
---
diff --git a/camel/camel-exchange-folder.h b/camel/camel-exchange-folder.h
index e709975..8b24e09 100644
--- a/camel/camel-exchange-folder.h
+++ b/camel/camel-exchange-folder.h
@@ -7,10 +7,7 @@
 #define CAMEL_EXCHANGE_FOLDER_H 1
 
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
+G_BEGIN_DECLS
 
 #include <camel/camel-offline-folder.h>
 #include <camel/camel-folder.h>
@@ -82,9 +79,7 @@ void     camel_exchange_folder_update_message_tag   (CamelExchangeFolder *exch,
 						     const gchar *value);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* CAMEL_EXCHANGE_FOLDER_H */
 
diff --git a/camel/camel-exchange-journal.h b/camel/camel-exchange-journal.h
index 0019159..ec94280 100644
--- a/camel/camel-exchange-journal.h
+++ b/camel/camel-exchange-journal.h
@@ -31,10 +31,7 @@
 #include <camel/camel-mime-message.h>
 #include "camel-exchange-folder.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define CAMEL_TYPE_EXCHANGE_JOURNAL            (camel_exchange_journal_get_type ())
 #define CAMEL_EXCHANGE_JOURNAL(obj)            (CAMEL_CHECK_CAST ((obj), CAMEL_TYPE_EXCHANGE_JOURNAL, CamelExchangeJournal))
@@ -95,8 +92,6 @@ void camel_exchange_journal_transfer (CamelExchangeJournal *journal, CamelExchan
 void camel_exchange_journal_delete (CamelExchangeJournal *journal, const gchar *uid,
 				    guint32 flags, guint32 set, CamelException *ex);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __CAMEL_EXCHANGE_JOURNAL_H__ */
diff --git a/camel/camel-exchange-store.h b/camel/camel-exchange-store.h
index 8e2f141..683e644 100644
--- a/camel/camel-exchange-store.h
+++ b/camel/camel-exchange-store.h
@@ -8,10 +8,7 @@
 #define CAMEL_EXCHANGE_STORE_H 1
 
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #include <camel/camel-store.h>
 #include <camel/camel-offline-store.h>
@@ -47,8 +44,6 @@ CamelType camel_exchange_store_get_type (void);
 
 gboolean camel_exchange_store_connected (CamelExchangeStore *store, CamelException *ex);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* CAMEL_EXCHANGE_STORE_H */
diff --git a/camel/camel-exchange-transport.h b/camel/camel-exchange-transport.h
index 1f1a6a6..08ea04c 100644
--- a/camel/camel-exchange-transport.h
+++ b/camel/camel-exchange-transport.h
@@ -8,10 +8,7 @@
 #define CAMEL_EXCHANGE_TRANSPORT_H 1
 
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
+G_BEGIN_DECLS
 
 #include <camel/camel-transport.h>
 
@@ -36,8 +33,6 @@ typedef struct {
 /* Standard Camel function */
 CamelType camel_exchange_transport_get_type (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* CAMEL_EXCHANGE_TRANSPORT_H */
diff --git a/camel/camel-stub-constants.h b/camel/camel-stub-constants.h
index 40ca41f..25db758 100644
--- a/camel/camel-stub-constants.h
+++ b/camel/camel-stub-constants.h
@@ -7,10 +7,7 @@
 #ifndef CAMEL_STUB_CONSTANTS_H
 #define CAMEL_STUB_CONSTANTS_H 1
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
+G_BEGIN_DECLS
 
 typedef enum {
 	CAMEL_STUB_CMD_CONNECT,
@@ -95,8 +92,6 @@ typedef enum {
 	CAMEL_STUB_STORE_FOLDER_INFO_SUBSCRIPTION_LIST	= (1<<4)
 } CamelStubStoreFlags;
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* CAMEL_STUB_CONSTANTS_H */
diff --git a/camel/camel-stub-marshal.h b/camel/camel-stub-marshal.h
index d01ff01..e64a09c 100644
--- a/camel/camel-stub-marshal.h
+++ b/camel/camel-stub-marshal.h
@@ -6,10 +6,7 @@
 #ifndef CAMEL_STUB_MARSHAL_H
 #define CAMEL_STUB_MARSHAL_H 1
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
+G_BEGIN_DECLS
 
 #include <glib.h>
 
@@ -44,9 +41,7 @@ gint               camel_stub_marshal_decode_bytes  (CamelStubMarshal *marshal,
 gint               camel_stub_marshal_flush         (CamelStubMarshal *marshal);
 gboolean          camel_stub_marshal_eof           (CamelStubMarshal *marshal);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* CAMEL_STUB_MARSHAL_H */
 
diff --git a/camel/camel-stub.h b/camel/camel-stub.h
index 0c176af..494911d 100644
--- a/camel/camel-stub.h
+++ b/camel/camel-stub.h
@@ -8,10 +8,7 @@
 #define CAMEL_STUB_H 1
 
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
+G_BEGIN_DECLS
 
 #include <camel/camel-object.h>
 #include <camel/camel-operation.h>
@@ -57,9 +54,7 @@ gboolean   camel_stub_send_oneway (CamelStub *stub,
 				   CamelStubCommand command, ...);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* CAMEL_STUB_H */
 
diff --git a/mail/mail-stub-exchange.h b/mail/mail-stub-exchange.h
index 2267619..0503a49 100644
--- a/mail/mail-stub-exchange.h
+++ b/mail/mail-stub-exchange.h
@@ -7,10 +7,7 @@
 #include "mail-stub.h"
 #include <exchange-account.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define MAIL_TYPE_STUB_EXCHANGE            (mail_stub_exchange_get_type ())
 #define MAIL_STUB_EXCHANGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MAIL_TYPE_STUB_EXCHANGE, MailStubExchange))
@@ -45,8 +42,6 @@ gboolean          mail_stub_exchange_construct  (MailStubExchange *exchange);
 MailStub         *mail_stub_exchange_new        (ExchangeAccount *account,
 						 gint cmd_fd, gint status_fd);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __MAIL_STUB_EXCHANGE_H__ */
diff --git a/mail/mail-stub-listener.h b/mail/mail-stub-listener.h
index 203d9c4..1d7045b 100644
--- a/mail/mail-stub-listener.h
+++ b/mail/mail-stub-listener.h
@@ -6,10 +6,7 @@
 
 #include <glib-object.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define MAIL_TYPE_STUB_LISTENER            (mail_stub_listener_get_type ())
 #define MAIL_STUB_LISTENER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MAIL_TYPE_STUB_LISTENER, MailStubListener))
@@ -43,8 +40,6 @@ gboolean          mail_stub_listener_construct     (MailStubListener *stub,
 
 MailStubListener *mail_stub_listener_new           (const gchar *socket_path);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __MAIL_STUB_LISTENER_H__ */
diff --git a/mail/mail-stub.h b/mail/mail-stub.h
index 2cb7178..6e932b5 100644
--- a/mail/mail-stub.h
+++ b/mail/mail-stub.h
@@ -9,10 +9,7 @@
 #include "camel-stub-constants.h"
 #include "camel-stub-marshal.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define MAIL_TYPE_STUB            (mail_stub_get_type ())
 #define MAIL_STUB(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MAIL_TYPE_STUB, MailStub))
@@ -109,8 +106,6 @@ typedef enum {
 	MAIL_STUB_MESSAGE_DELEGATED    = (1 << 16)
 } MailStubMessageFlags;
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __MAIL_STUB_H__ */
diff --git a/mail/mail-utils.h b/mail/mail-utils.h
index 92b9604..15fc1b2 100644
--- a/mail/mail-utils.h
+++ b/mail/mail-utils.h
@@ -4,13 +4,10 @@
 #ifndef __MAIL_UTILS_H__
 #define __MAIL_UTILS_H__
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
 #include "e2k-properties.h"
 
+G_BEGIN_DECLS
+
 typedef enum {
 	MAIL_UTIL_DEMANGLE_DELGATED_MEETING,
 	MAIL_UTIL_DEMANGLE_MEETING_IN_SUBSCRIBED_INBOX,
@@ -34,8 +31,6 @@ mail_util_demangle_meeting_related_message (GString *body,
 				const gchar *subscriber_email,
 				MailUtilDemangleType unmangle_type);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __MAIL_UTILS_H__ */
diff --git a/storage/exchange-autoconfig-wizard.h b/storage/exchange-autoconfig-wizard.h
index 2aceb16..becea30 100644
--- a/storage/exchange-autoconfig-wizard.h
+++ b/storage/exchange-autoconfig-wizard.h
@@ -8,17 +8,12 @@
 
 #include <bonobo/bonobo-object.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 BonoboObject *exchange_autoconfig_wizard_new (void);
 
 void          exchange_autoconfig_druid_run  (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_AUTOCONFIG_WIZARD_H__ */
diff --git a/storage/exchange-change-password.h b/storage/exchange-change-password.h
index 82e67f9..fdd7811 100644
--- a/storage/exchange-change-password.h
+++ b/storage/exchange-change-password.h
@@ -6,16 +6,11 @@
 
 #include "exchange-types.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 gchar *exchange_get_new_password (const gchar *existing_password,
 				 gboolean    voluntary);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_CHANGE_PASSWORD_H__ */
diff --git a/storage/exchange-component.h b/storage/exchange-component.h
index ba8ed83..d0b3ed8 100644
--- a/storage/exchange-component.h
+++ b/storage/exchange-component.h
@@ -10,10 +10,7 @@
 #include <shell/Evolution.h>
 #include <exchange-types.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EXCHANGE_TYPE_COMPONENT               (exchange_component_get_type ())
 #define EXCHANGE_COMPONENT(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_COMPONENT, ExchangeComponent))
@@ -60,8 +57,6 @@ void exchange_component_set_factories (ExchangeComponent *component,
 #define EXCHANGE_ADDRESSBOOK_FACTORY_ID	"OAFIID:GNOME_Evolution_Exchange_Connector_BookFactory:" API_VERSION
 #define EXCHANGE_AUTOCONFIG_WIZARD_ID	"OAFIID:GNOME_Evolution_Exchange_Connector_Startup_Wizard:" BASE_VERSION
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_COMPONENT_H__ */
diff --git a/storage/exchange-config-listener.h b/storage/exchange-config-listener.h
index b713822..b2abc14 100644
--- a/storage/exchange-config-listener.h
+++ b/storage/exchange-config-listener.h
@@ -10,10 +10,7 @@
 #include <libedataserver/e-source-list.h>
 #include <libedataserver/e-source-group.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EXCHANGE_TYPE_CONFIG_LISTENER            (exchange_config_listener_get_type ())
 #define EXCHANGE_CONFIG_LISTENER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_CONFIG_LISTENER, ExchangeConfigListener))
@@ -59,8 +56,6 @@ void			exchange_config_listener_migrate_esources (ExchangeConfigListener *config
 
 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_CONFIG_LISTENER_H__ */
diff --git a/storage/exchange-storage.h b/storage/exchange-storage.h
index ace0fef..77a9541 100644
--- a/storage/exchange-storage.h
+++ b/storage/exchange-storage.h
@@ -7,10 +7,7 @@
 #include "exchange-types.h"
 #include "e-storage.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EXCHANGE_TYPE_STORAGE            (exchange_storage_get_type ())
 #define EXCHANGE_STORAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_STORAGE, ExchangeStorage))
@@ -41,8 +38,6 @@ extern const gchar *_exchange_storage_imagesdir;
 
 #endif
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EXCHANGE_STORAGE_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]