Use G_BEGIN/END_DECLS instead of a lot of #ifdef __cplusplus stuff. Closes

2006-05-05  Kjartan Maraas  <kmaraas@gnome.org>

	* gconf/gconf-changeset.h:
	* gconf/gconf-client.h:
	* gconf/gconf-database.h:
	* gconf/gconf-engine.h:
	* gconf/gconf-error.h:
	* gconf/gconf-listeners.h:
	* gconf/gconf-locale.h:
	* gconf/gconf-schema.h:
	* gconf/gconf-value.h:
	* gconf/gconf.h:
	* gconf/gconfd.h: Use G_BEGIN/END_DECLS instead
	of a lot of #ifdef __cplusplus stuff. Closes bug 306313.
	Patch from Fabrício Barros Cebral.

12 files changed, 38 insertions, 66 deletions

diff --git a/ChangeLog b/ChangeLog
index fd013068..086f83fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2006-05-05  Kjartan Maraas  <kmaraas@gnome.org>
 
+	* gconf/gconf-changeset.h:
+	* gconf/gconf-client.h:
+	* gconf/gconf-database.h:
+	* gconf/gconf-engine.h:
+	* gconf/gconf-error.h:
+	* gconf/gconf-listeners.h:
+	* gconf/gconf-locale.h:
+	* gconf/gconf-schema.h:
+	* gconf/gconf-value.h:
+	* gconf/gconf.h:
+	* gconf/gconfd.h: Use G_BEGIN/END_DECLS instead
+	of a lot of #ifdef __cplusplus stuff. Closes bug 306313.
+	Patch from Fabrício Barros Cebral.
+
+2006-05-05  Kjartan Maraas  <kmaraas@gnome.org>
+
 	* backends/markup-tree.c: (parse_value_element):
 	Use the right variable in test. Closes coverity #1238
 	and GNOME bug #338195.
diff --git a/gconf/gconf-changeset.h b/gconf/gconf-changeset.h
index 72b1f577..bebec014 100644
--- a/gconf/gconf-changeset.h
+++ b/gconf/gconf-changeset.h
@@ -22,9 +22,7 @@
 
 #include <gconf/gconf.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * A GConfChangeSet is basically a hash from keys to "changes in value,"
@@ -136,9 +134,7 @@ gpointer gconf_change_set_get_user_data (GConfChangeSet *cs);
 
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
diff --git a/gconf/gconf-client.h b/gconf/gconf-client.h
index 5cf2bb13..d24af511 100644
--- a/gconf/gconf-client.h
+++ b/gconf/gconf-client.h
@@ -26,9 +26,7 @@
 #include <gconf/gconf-listeners.h>
 #include <gconf/gconf-changeset.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * This is a wrapper for the client-side GConf API which provides several
@@ -385,9 +383,7 @@ GConfChangeSet* gconf_client_change_set_from_current (GConfClient* client,
                                                              const gchar* first_key,
                                                              ...) G_GNUC_NULL_TERMINATED;
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
diff --git a/gconf/gconf-database.h b/gconf/gconf-database.h
index c490134b..627f37ce 100644
--- a/gconf/gconf-database.h
+++ b/gconf/gconf-database.h
@@ -22,9 +22,7 @@
 
 #include <glib.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #include "gconf-error.h"
 #include "GConfX.h"
@@ -146,9 +144,7 @@ void gconf_database_log_listeners_to_string (GConfDatabase *db,
                                              gboolean is_default,
                                              GString *str);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
diff --git a/gconf/gconf-engine.h b/gconf/gconf-engine.h
index 8658270d..009a49dd 100644
--- a/gconf/gconf-engine.h
+++ b/gconf/gconf-engine.h
@@ -23,9 +23,7 @@
 #include <glib.h>
 #include <gconf/gconf-error.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* A configuration engine (stack of config sources); normally there's
  * just one of these on the system.  
@@ -57,9 +55,7 @@ void         gconf_engine_set_user_data  (GConfEngine   *engine,
 gpointer     gconf_engine_get_user_data  (GConfEngine   *engine);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
diff --git a/gconf/gconf-error.h b/gconf/gconf-error.h
index 5f84df3d..26e080f4 100644
--- a/gconf/gconf-error.h
+++ b/gconf/gconf-error.h
@@ -22,9 +22,7 @@
 
 #include <glib.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GCONF_ERROR gconf_error_quark ()
 
@@ -56,9 +54,7 @@ typedef enum {
 
 GQuark gconf_error_quark (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
diff --git a/gconf/gconf-listeners.h b/gconf/gconf-listeners.h
index c5019662..8821801d 100644
--- a/gconf/gconf-listeners.h
+++ b/gconf/gconf-listeners.h
@@ -22,9 +22,7 @@
 
 #include <glib.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * The listeners object is used to store listeners who want notification
@@ -85,9 +83,7 @@ void     gconf_listeners_remove_if (GConfListeners         *listeners,
                                     GConfListenersPredicate predicate,
                                     gpointer                user_data);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
diff --git a/gconf/gconf-locale.h b/gconf/gconf-locale.h
index 79425179..6332a2e3 100644
--- a/gconf/gconf-locale.h
+++ b/gconf/gconf-locale.h
@@ -22,9 +22,7 @@
 
 #include <glib.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * This thing caches the fallback list for a locale string.
@@ -63,9 +61,7 @@ GConfLocaleList*  gconf_locale_cache_get_list      (GConfLocaleCache* cache,
 /* Use this if you don't care about the locale cache */
 gchar**           gconf_split_locale               (const gchar* locale);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
diff --git a/gconf/gconf-schema.h b/gconf/gconf-schema.h
index 383482d7..1f512f30 100644
--- a/gconf/gconf-schema.h
+++ b/gconf/gconf-schema.h
@@ -25,9 +25,7 @@
 
 #include <gconf/gconf-value.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  *  A "schema" is a value that describes a key-value pair.
@@ -73,9 +71,7 @@ const char*    gconf_schema_get_owner         (const GConfSchema *schema);
 GConfValue*    gconf_schema_get_default_value (const GConfSchema *schema);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
diff --git a/gconf/gconf-value.h b/gconf/gconf-value.h
index ad4a8952..d6174a4c 100644
--- a/gconf/gconf-value.h
+++ b/gconf/gconf-value.h
@@ -24,9 +24,7 @@
 #include <glib.h>
 #include "gconf-error.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* 
  * A GConfValue is used to pass configuration values around
@@ -196,9 +194,7 @@ void        gconf_entry_set_is_writable  (GConfEntry  *entry,
 gboolean    gconf_entry_equal            (const GConfEntry *a,
                                           const GConfEntry *b);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
 
diff --git a/gconf/gconf.h b/gconf/gconf.h
index 7c4212b3..a5390f02 100644
--- a/gconf/gconf.h
+++ b/gconf/gconf.h
@@ -22,9 +22,7 @@
 
 #include <glib.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #include <gconf/gconf-schema.h>
 #include <gconf/gconf-engine.h>
@@ -304,8 +302,6 @@ GConfValue * gconf_engine_get_full (GConfEngine *conf,
 
 #endif /* GCONF_ENABLE_INTERNALS */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
diff --git a/gconf/gconfd.h b/gconf/gconfd.h
index 8421c579..ddcf286b 100644
--- a/gconf/gconfd.h
+++ b/gconf/gconfd.h
@@ -22,9 +22,7 @@
 
 #include <glib.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #include "gconf-error.h"
 #include "GConfX.h"
@@ -50,9 +48,7 @@ void gconfd_notify_other_listeners (GConfDatabase *modified_db,
 
 void gconfd_need_log_cleanup (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif