7 files changed, 14 insertions, 43 deletions
diff --git a/widgets/table/e-table-defines.h b/widgets/table/e-table-defines.h
index c2511c0a42..de23cb994d 100644
--- a/widgets/table/e-table-defines.h
+++ b/widgets/table/e-table-defines.h
@@ -24,9 +24,7 @@
 #ifndef __E_TABLE_DEFINES__
 #define __E_TABLE_DEFINES__ 1
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define BUTTON_HEIGHT        10
 #define BUTTON_PADDING       2
@@ -37,9 +35,7 @@ extern "C" {
 
 #define MIN_ARROW_SIZE 10
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif
diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h
index e0bc591f25..8d12eb34db 100644
--- a/widgets/table/e-table-field-chooser-dialog.h
+++ b/widgets/table/e-table-field-chooser-dialog.h
@@ -27,10 +27,7 @@
 #include <table/e-table-field-chooser.h>
 #include <table/e-table-header.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* ETableFieldChooserDialog - A dialog displaying information about a contact.
  *
@@ -70,9 +67,7 @@ struct _ETableFieldChooserDialogClass
 GtkWidget *e_table_field_chooser_dialog_new(void);
 GType      e_table_field_chooser_dialog_get_type (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __E_TABLE_FIELD_CHOOSER_DIALOG_H__ */
diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h
index 60b373ef7f..9117262d52 100644
--- a/widgets/table/e-table-header-utils.h
+++ b/widgets/table/e-table-header-utils.h
@@ -28,9 +28,7 @@
 
 #include <table/e-table-col.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 gdouble  e_table_header_compute_height (ETableCol *ecol,
 				       GtkWidget *widget);
@@ -48,8 +46,6 @@ void    e_table_header_draw_button     (GdkDrawable    *drawable,
 					gint             button_height,
 					ETableColArrow  arrow);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif
diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h
index cbd73901e0..380f49cccd 100644
--- a/widgets/table/e-table-selection-model.h
+++ b/widgets/table/e-table-selection-model.h
@@ -29,9 +29,7 @@
 #include <table/e-table-model.h>
 #include <table/e-table-header.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TABLE_SELECTION_MODEL_TYPE        (e_table_selection_model_get_type ())
 #define E_TABLE_SELECTION_MODEL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_SELECTION_MODEL_TYPE, ETableSelectionModel))
@@ -68,9 +66,7 @@ typedef struct {
 GType                 e_table_selection_model_get_type            (void);
 ETableSelectionModel *e_table_selection_model_new                 (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* _E_TABLE_SELECTION_MODEL_H_ */
diff --git a/widgets/table/e-table-without.h b/widgets/table/e-table-without.h
index e4aabbd64d..799c107d20 100644
--- a/widgets/table/e-table-without.h
+++ b/widgets/table/e-table-without.h
@@ -27,9 +27,7 @@
 #include <glib-object.h>
 #include <table/e-table-subset.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TABLE_WITHOUT_TYPE        (e_table_without_get_type ())
 #define E_TABLE_WITHOUT(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_WITHOUT_TYPE, ETableWithout))
@@ -82,9 +80,7 @@ void         e_table_without_hide_adopt (ETableWithout                 *etw,
 void         e_table_without_show       (ETableWithout                 *etw,
 					 void                          *key);
 void         e_table_without_show_all   (ETableWithout                 *etw);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* _E_TABLE_WITHOUT_H_ */
diff --git a/widgets/table/e-tree-memory-callbacks.h b/widgets/table/e-tree-memory-callbacks.h
index a7705795af..e76c68793c 100644
--- a/widgets/table/e-tree-memory-callbacks.h
+++ b/widgets/table/e-tree-memory-callbacks.h
@@ -25,9 +25,7 @@
 
 #include <table/e-tree-memory.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TREE_MEMORY_CALLBACKS_TYPE        (e_tree_memory_callbacks_get_type ())
 #define E_TREE_MEMORY_CALLBACKS(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TREE_MEMORY_CALLBACKS_TYPE, ETreeMemoryCallbacks))
@@ -112,8 +110,6 @@ ETreeModel *e_tree_memory_callbacks_new  (ETreeMemoryCallbacksIconAtFn icon_at,
 
 					  gpointer                                 model_data);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_TREE_MEMORY_CALLBACKS_H_ */
diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h
index 8652851dcc..c112c40786 100644
--- a/widgets/table/e-tree-selection-model.h
+++ b/widgets/table/e-tree-selection-model.h
@@ -28,9 +28,7 @@
 #include <misc/e-selection-model.h>
 #include <table/e-tree-model.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef void (*ETreeForeachFunc) (ETreePath path,
 				  gpointer closure);
@@ -69,9 +67,7 @@ void             e_tree_selection_model_change_cursor       (ETreeSelectionModel
 							     ETreePath            path);
 ETreePath        e_tree_selection_model_get_cursor          (ETreeSelectionModel *etsm);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* _E_TREE_SELECTION_MODEL_H_ */