From 67159043da2de9df576f6a4eaa245e0c3926f004 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 18 Jun 2009 12:56:51 -0400
Subject: Use G_BEGIN_DECLS / G_END_DECLS macros.

---
 plugins/groupwise-features/junk-settings.h | 9 ++-------
 plugins/groupwise-features/share-folder.h  | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'plugins/groupwise-features')

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__ */
-- 
cgit v1.2.3