Bug #694152 - Compile errors in C++ due to G_BEGIN/END_DECLS

diff --git a/camel/camel-db.h b/camel/camel-db.h
index deb9a11..167a276 100644 (file)
--- a/camel/camel-db.h
+++ b/camel/camel-db.h
@@ -10,6 +10,8 @@
 #include <sqlite3.h>
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 /**
  * CAMEL_DB_FILE:
  *
@@ -320,4 +322,6 @@ gint camel_db_write_preview_record (CamelDB *db, const gchar *folder_name, const
 gint
 camel_db_reset_folder_version (CamelDB *cdb, const gchar *folder_name, gint reset_version, GError **error);
 
+G_END_DECLS
+
 #endif

diff --git a/camel/camel-imapx-conn-manager.h b/camel/camel-imapx-conn-manager.h
index af65c78..b7b9cbd 100644 (file)
--- a/camel/camel-imapx-conn-manager.h
+++ b/camel/camel-imapx-conn-manager.h
@@ -28,6 +28,8 @@
 
 #include "camel-imapx-server.h"
 
+G_BEGIN_DECLS
+
 /* Standard GObject macros */
 #define CAMEL_TYPE_IMAPX_CONN_MANAGER \
        (camel_imapx_conn_manager_get_type ())
@@ -80,4 +82,6 @@ void          camel_imapx_conn_manager_update_con_info
                                                 CamelIMAPXServer *server,
                                                 const gchar *folder_name);
 
+G_END_DECLS
+
 #endif /* _CAMEL_IMAPX_SERVER_H */

diff --git a/camel/camel-imapx-utils.h b/camel/camel-imapx-utils.h
index 714f6d9..7d32880 100644 (file)
--- a/camel/camel-imapx-utils.h
+++ b/camel/camel-imapx-utils.h
@@ -26,6 +26,8 @@
 
 #include <camel/camel-store.h>
 
+G_BEGIN_DECLS
+
 struct _CamelIMAPXStream;
 struct _CamelFlag;
 struct _CamelIMAPXNamespaceList;
@@ -398,5 +400,7 @@ struct _CamelIMAPXNamespaceList *
 struct _CamelIMAPXNamespaceList *
                camel_imapx_namespace_list_copy (const struct _CamelIMAPXNamespaceList *nsl);
 
+G_END_DECLS
+
 #endif /* CAMEL_IMAPX_UTILS_H */