aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-06-18 22:50:51 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-06-18 22:50:51 +0800
commit00d56cd32c5d0a7f49567d5241ba0d6fd80940bb (patch)
tree6e3e6e92e18788d0d5231291e8b66a4b601bb923 /plugins
parentb03af89f65d23f28a29ecea7171d0f89ac3b9bca (diff)
downloadgsoc2013-evolution-00d56cd32c5d0a7f49567d5241ba0d6fd80940bb.tar.gz
gsoc2013-evolution-00d56cd32c5d0a7f49567d5241ba0d6fd80940bb.tar.zst
gsoc2013-evolution-00d56cd32c5d0a7f49567d5241ba0d6fd80940bb.zip
Use G_BEGIN_DECLS / G_END_DECLS macros.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/exchange-operations/exchange-change-password.h9
-rw-r--r--plugins/exchange-operations/exchange-config-listener.h9
-rw-r--r--plugins/exchange-operations/exchange-delegates-user.h9
-rw-r--r--plugins/exchange-operations/exchange-delegates.h9
-rw-r--r--plugins/exchange-operations/exchange-folder-size-display.h9
-rw-r--r--plugins/exchange-operations/exchange-operations.h9
-rw-r--r--plugins/exchange-operations/exchange-permissions-dialog.h9
-rw-r--r--plugins/groupwise-features/junk-settings.h9
-rw-r--r--plugins/groupwise-features/share-folder.h9
9 files changed, 18 insertions, 63 deletions
diff --git a/plugins/exchange-operations/exchange-change-password.h b/plugins/exchange-operations/exchange-change-password.h
index 389922f1b3..c33a887c50 100644
--- a/plugins/exchange-operations/exchange-change-password.h
+++ b/plugins/exchange-operations/exchange-change-password.h
@@ -23,16 +23,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/plugins/exchange-operations/exchange-config-listener.h b/plugins/exchange-operations/exchange-config-listener.h
index c079b7eac7..07051bcecc 100644
--- a/plugins/exchange-operations/exchange-config-listener.h
+++ b/plugins/exchange-operations/exchange-config-listener.h
@@ -29,10 +29,7 @@
#include <libedataserver/e-source-list.h>
#include <libedataserver/e-source-group.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
typedef enum {
CONFIG_LISTENER_STATUS_OK,
@@ -82,8 +79,6 @@ void exchange_config_listener_modify_esource_group_name (ExchangeConfigListener
ExchangeAccountResult exchange_config_listener_authenticate (ExchangeConfigListener *excl,
ExchangeAccount *account);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* __EXCHANGE_CONFIG_LISTENER_H__ */
diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h
index d1a38ca876..deb5b04152 100644
--- a/plugins/exchange-operations/exchange-delegates-user.h
+++ b/plugins/exchange-operations/exchange-delegates-user.h
@@ -25,10 +25,7 @@
#include <e2k-security-descriptor.h>
#include <gtk/gtk.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define EXCHANGE_TYPE_DELEGATES_USER (exchange_delegates_user_get_type ())
#define EXCHANGE_DELEGATES_USER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_DELEGATES_USER, ExchangeDelegatesUser))
@@ -81,8 +78,6 @@ gboolean exchange_delegates_user_edit (ExchangeAccount *account, ExchangeDeleg
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* __EXCHANGE_DELEGATES_USER_H__ */
diff --git a/plugins/exchange-operations/exchange-delegates.h b/plugins/exchange-operations/exchange-delegates.h
index 5defd27f9a..ae890479d6 100644
--- a/plugins/exchange-operations/exchange-delegates.h
+++ b/plugins/exchange-operations/exchange-delegates.h
@@ -24,16 +24,11 @@
#include <exchange-types.h>
#include <gtk/gtk.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
void exchange_delegates (ExchangeAccount *account, GtkWidget *parent);
const gchar *email_look_up (const gchar *delegate_legacy, ExchangeAccount *account);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* __EXCHANGE_DELEGATES_CONTROL_H__ */
diff --git a/plugins/exchange-operations/exchange-folder-size-display.h b/plugins/exchange-operations/exchange-folder-size-display.h
index 08f22c7114..13d112c9ef 100644
--- a/plugins/exchange-operations/exchange-folder-size-display.h
+++ b/plugins/exchange-operations/exchange-folder-size-display.h
@@ -23,16 +23,11 @@
#include <gtk/gtk.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
void exchange_folder_size_display (GtkListStore *model, GtkWidget *parent);
gchar * exchange_folder_size_get_val (GtkListStore *model, const gchar *folder_name);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* __EXCHANGE_FOLDER_SIZE_DISPLAY_H__ */
diff --git a/plugins/exchange-operations/exchange-operations.h b/plugins/exchange-operations/exchange-operations.h
index 3b4518f5fa..d735ff8ce8 100644
--- a/plugins/exchange-operations/exchange-operations.h
+++ b/plugins/exchange-operations/exchange-operations.h
@@ -29,10 +29,7 @@
#include "exchange-config-listener.h"
#include <exchange-account.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define ERROR_DOMAIN "org-gnome-exchange-operations"
@@ -54,8 +51,6 @@ void exchange_operations_update_child_esources (ESource *source, const gchar *ol
gboolean is_exchange_personal_folder (ExchangeAccount *account, gchar *uri);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif
diff --git a/plugins/exchange-operations/exchange-permissions-dialog.h b/plugins/exchange-operations/exchange-permissions-dialog.h
index 18bdcd4371..ad2f47de4e 100644
--- a/plugins/exchange-operations/exchange-permissions-dialog.h
+++ b/plugins/exchange-operations/exchange-permissions-dialog.h
@@ -26,10 +26,7 @@
#include "e-folder.h"
#include "exchange-types.h"
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define EXCHANGE_TYPE_PERMISSIONS_DIALOG (exchange_permissions_dialog_get_type ())
#define EXCHANGE_PERMISSIONS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_PERMISSIONS_DIALOG, ExchangePermissionsDialog))
@@ -54,8 +51,6 @@ void exchange_permissions_dialog_new (ExchangeAccount *account,
EFolder *folder,
GtkWidget *parent);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* __EXCHANGE_PERMISSIONS_DIALOG_H__ */
diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h
index 13e8a25c9b..fd728cbb21 100644
--- a/plugins/groupwise-features/junk-settings.h
+++ b/plugins/groupwise-features/junk-settings.h
@@ -24,10 +24,7 @@
#ifndef __JUNK_SETTINGS_H__
#define __JUNK_SETTINGS_H__
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#include <gtk/gtk.h>
#include <camel/camel-store.h>
@@ -95,8 +92,6 @@ GType junk_settings_get_type (void);
struct _JunkSettings * junk_settings_new (EGwConnection *ccnc);
void commit_changes (JunkSettings *js);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* __JUNK_SETTINGS_H__ */
diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h
index 8ff4ec3521..d95d9732a4 100644
--- a/plugins/groupwise-features/share-folder.h
+++ b/plugins/groupwise-features/share-folder.h
@@ -24,10 +24,7 @@
#ifndef __SHARE_FOLDER_H__
#define __SHARE_FOLDER_H__
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#include <gtk/gtk.h>
#include <camel/camel-store.h>
@@ -112,8 +109,6 @@ void share_folder(struct _ShareFolder *sf);
gchar * get_container_id (EGwConnection *cnc, const gchar *fname);
EGwConnection * get_cnc (CamelStore *store);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* __SHARE_FOLDER_H__ */