Use G_BEGIN_DECLS / G_END_DECLS macros.

33 files changed, 66 insertions, 215 deletions

diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h
index 14112dfdb3..ab499d45d5 100644
--- a/widgets/menus/gal-define-views-dialog.h
+++ b/widgets/menus/gal-define-views-dialog.h
@@ -28,10 +28,7 @@
 
 #include <widgets/menus/gal-view-collection.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* GalDefineViewsDialog - A dialog displaying information about a contact.
  *
@@ -70,9 +67,7 @@ struct _GalDefineViewsDialogClass
 GtkWidget               *gal_define_views_dialog_new          (GalViewCollection *collection);
 GType                    gal_define_views_dialog_get_type     (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GAL_DEFINE_VIEWS_DIALOG_H__ */
diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h
index 2441cf7654..c408fea067 100644
--- a/widgets/menus/gal-define-views-model.h
+++ b/widgets/menus/gal-define-views-model.h
@@ -28,9 +28,7 @@
 #include <widgets/menus/gal-view.h>
 #include <widgets/menus/gal-view-collection.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAL_DEFINE_VIEWS_MODEL_TYPE        (gal_define_views_model_get_type ())
 #define GAL_DEFINE_VIEWS_MODEL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_DEFINE_VIEWS_MODEL_TYPE, GalDefineViewsModel))
@@ -65,8 +63,6 @@ void         gal_define_views_model_delete_view  (GalDefineViewsModel *model,
 void         gal_define_views_model_copy_view    (GalDefineViewsModel *model,
 						  gint                  i);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _GAL_DEFINE_VIEWS_MODEL_H_ */
diff --git a/widgets/menus/gal-view-factory-etable.h b/widgets/menus/gal-view-factory-etable.h
index 440d6c6d22..50d3a0ac50 100644
--- a/widgets/menus/gal-view-factory-etable.h
+++ b/widgets/menus/gal-view-factory-etable.h
@@ -28,9 +28,7 @@
 #include <widgets/menus/gal-view-factory.h>
 #include <table/e-table-specification.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAL_VIEW_FACTORY_ETABLE_TYPE        (gal_view_factory_etable_get_type ())
 #define GAL_VIEW_FACTORY_ETABLE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_VIEW_FACTORY_ETABLE_TYPE, GalViewFactoryEtable))
@@ -55,8 +53,6 @@ GalViewFactory *gal_view_factory_etable_new        (ETableSpecification  *spec);
 GalViewFactory *gal_view_factory_etable_construct  (GalViewFactoryEtable *factory,
 						    ETableSpecification  *spec);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _GAL_VIEW_FACTORY_ETABLE_H_ */
diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h
index 59f46a20e9..41b7564de0 100644
--- a/widgets/menus/gal-view-factory.h
+++ b/widgets/menus/gal-view-factory.h
@@ -27,9 +27,7 @@
 #include <glib-object.h>
 #include <widgets/menus/gal-view.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAL_VIEW_FACTORY_TYPE        (gal_view_factory_get_type ())
 #define GAL_VIEW_FACTORY(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_VIEW_FACTORY_TYPE, GalViewFactory))
@@ -71,9 +69,7 @@ const gchar *gal_view_factory_get_type_code  (GalViewFactory *factory);
 GalView    *gal_view_factory_new_view       (GalViewFactory *factory,
 					     const gchar     *name);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* _GAL_VIEW_FACTORY_H_ */
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.h b/widgets/menus/gal-view-instance-save-as-dialog.h
index 2135bc560f..600aa6765a 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.h
+++ b/widgets/menus/gal-view-instance-save-as-dialog.h
@@ -28,10 +28,7 @@
 #include <widgets/menus/gal-view-collection.h>
 #include <widgets/menus/gal-view-instance.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* GalViewInstanceSaveAsDialog - A dialog displaying information about a contact.
  *
@@ -83,9 +80,7 @@ GType      gal_view_instance_save_as_dialog_get_type  (void);
 
 void       gal_view_instance_save_as_dialog_save      (GalViewInstanceSaveAsDialog *dialog);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_H__ */
diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h
index d2acd5d301..06bcb96bb9 100644
--- a/widgets/menus/gal-view-new-dialog.h
+++ b/widgets/menus/gal-view-new-dialog.h
@@ -27,10 +27,7 @@
 #include <glade/glade.h>
 #include <gal-view-collection.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* GalViewNewDialog - A dialog displaying information about a contact.
  *
@@ -76,9 +73,7 @@ GType      gal_view_new_dialog_get_type   (void);
 GtkWidget *gal_view_new_dialog_construct  (GalViewNewDialog  *dialog,
 					   GalViewCollection *collection);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __GAL_VIEW_NEW_DIALOG_H__ */
diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h
index ce73400033..8973733a3b 100644
--- a/widgets/menus/gal-view.h
+++ b/widgets/menus/gal-view.h
@@ -27,9 +27,7 @@
 #include <gtk/gtk.h>
 #include <libxml/tree.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GAL_VIEW_TYPE        (gal_view_get_type ())
 #define GAL_VIEW(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), GAL_VIEW_TYPE, GalView))
@@ -91,8 +89,6 @@ GalView    *gal_view_clone          (GalView    *view);
 void        gal_view_changed        (GalView    *view);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _GAL_VIEW_H_ */
diff --git a/widgets/misc/e-activity-handler.h b/widgets/misc/e-activity-handler.h
index 65bd1ded97..880972867e 100644
--- a/widgets/misc/e-activity-handler.h
+++ b/widgets/misc/e-activity-handler.h
@@ -27,10 +27,7 @@
 #include "e-util/e-logger.h"
 #include <glib-object.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_ACTIVITY_HANDLER			(e_activity_handler_get_type ())
 #define E_ACTIVITY_HANDLER(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ACTIVITY_HANDLER, EActivityHandler))
@@ -101,8 +98,6 @@ e_activity_handler_operation_set_error (EActivityHandler *activity_handler,
 void
 e_activity_handler_set_error_flush_time (EActivityHandler *handler, gint time);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_ACTIVITY_HANDLER_H_ */
diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h
index 926ba1c077..f86fc4fd79 100644
--- a/widgets/misc/e-calendar-item.h
+++ b/widgets/misc/e-calendar-item.h
@@ -27,9 +27,7 @@
 
 #include <libgnomecanvas/gnome-canvas.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * ECalendarItem - canvas item displaying a calendar.
@@ -367,8 +365,6 @@ gint e_calendar_item_get_week_number	(ECalendarItem *calitem,
 void e_calendar_item_style_set (GtkWidget *widget, ECalendarItem *calitem);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_CALENDAR_ITEM_H_ */
diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h
index 7a3c8fd010..911e9ee22a 100644
--- a/widgets/misc/e-calendar.h
+++ b/widgets/misc/e-calendar.h
@@ -27,9 +27,7 @@
 #include <misc/e-canvas.h>
 #include "e-calendar-item.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * ECalendar - displays a table of monthly calendars, allowing highlighting
@@ -95,8 +93,6 @@ void	   e_calendar_get_border_size	(ECalendar	*cal,
 
 void       e_calendar_set_focusable (ECalendar *cal, gboolean focusable);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_CALENDAR_H_ */
diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h
index 7fa38fa778..fb049c3e9c 100644
--- a/widgets/misc/e-canvas-vbox.h
+++ b/widgets/misc/e-canvas-vbox.h
@@ -26,10 +26,7 @@
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* ECanvasVbox - A canvas item container.
  *
@@ -84,9 +81,7 @@ void       e_canvas_vbox_add_item(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *i
 void       e_canvas_vbox_add_item_start(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item);
 GType      e_canvas_vbox_get_type (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __E_CANVAS_VBOX_H__ */
diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h
index 5f60fc4046..58994d6e29 100644
--- a/widgets/misc/e-canvas.h
+++ b/widgets/misc/e-canvas.h
@@ -26,10 +26,7 @@
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* ECanvas - A class derived from canvas for the purpose of adding
  * evolution specific canvas hacks.
@@ -148,9 +145,7 @@ void       e_canvas_popup_tooltip                        (ECanvas
 							  gint                              y);
 void       e_canvas_hide_tooltip                         (ECanvas                         *canvas);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __E_CANVAS_H__ */
diff --git a/widgets/misc/e-combo-button.h b/widgets/misc/e-combo-button.h
index c36948cbde..29d4b2efe7 100644
--- a/widgets/misc/e-combo-button.h
+++ b/widgets/misc/e-combo-button.h
@@ -29,10 +29,7 @@
 
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_COMBO_BUTTON			(e_combo_button_get_type ())
 #define E_COMBO_BUTTON(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_COMBO_BUTTON, EComboButton))
@@ -76,8 +73,6 @@ GtkWidget *e_combo_button_get_label  (EComboButton *combo_button);
 
 gboolean   e_combo_button_popup_menu (EComboButton *combo_button);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_COMBO_BUTTON_H_ */
diff --git a/widgets/misc/e-config-page.h b/widgets/misc/e-config-page.h
index 886d89d851..1de9591397 100644
--- a/widgets/misc/e-config-page.h
+++ b/widgets/misc/e-config-page.h
@@ -29,10 +29,7 @@
 
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_CONFIG_PAGE			(e_config_page_get_type ())
 #define E_CONFIG_PAGE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CONFIG_PAGE, EConfigPage))
@@ -60,8 +57,6 @@ struct _EConfigPageClass {
 GType      e_config_page_get_type    (void);
 GtkWidget *e_config_page_new         (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_CONFIG_PAGE_H_ */
diff --git a/widgets/misc/e-dropdown-button.h b/widgets/misc/e-dropdown-button.h
index 19f678b4eb..f58cd73085 100644
--- a/widgets/misc/e-dropdown-button.h
+++ b/widgets/misc/e-dropdown-button.h
@@ -29,10 +29,7 @@
 
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_DROPDOWN_BUTTON		  (e_dropdown_button_get_type ())
 #define E_DROPDOWN_BUTTON(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DROPDOWN_BUTTON, EDropdownButton))
@@ -63,8 +60,6 @@ void       e_dropdown_button_construct  (EDropdownButton *dropdown_button,
 GtkWidget *e_dropdown_button_new        (const gchar      *label_text,
 					 GtkMenu         *menu);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_DROPDOWN_BUTTON_H_ */
diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h
index 3e22182021..f25a66fa73 100644
--- a/widgets/misc/e-filter-bar.h
+++ b/widgets/misc/e-filter-bar.h
@@ -32,10 +32,7 @@
 #include "filter/rule-context.h"
 #include "filter/filter-rule.h"
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* EFilterBar - A filter rule driven search bar.
  *
@@ -137,9 +134,7 @@ e_filter_bar_new_construct	  (RuleContext *context,
 				   EFilterBarConfigRule config,
 				   gpointer data ,EFilterBar *bar );
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __E_FILTER_BAR_H__ */
diff --git a/widgets/misc/e-info-label.h b/widgets/misc/e-info-label.h
index 1541fb8f10..8509e30130 100644
--- a/widgets/misc/e-info-label.h
+++ b/widgets/misc/e-info-label.h
@@ -26,10 +26,7 @@
 
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_INFO_LABEL_GET_CLASS(emfv)  ((EInfoLabelClass *) G_OBJECT_GET_CLASS (emfv))
 
@@ -52,8 +49,6 @@ GType e_info_label_get_type(void);
 GtkWidget *e_info_label_new(const gchar *icon);
 void e_info_label_set_info(EInfoLabel *, const gchar *loc, const gchar *info);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* ! _E_INFO_LABEL_H */
diff --git a/widgets/misc/e-multi-config-dialog.h b/widgets/misc/e-multi-config-dialog.h
index 88a538bb1f..1bc310b888 100644
--- a/widgets/misc/e-multi-config-dialog.h
+++ b/widgets/misc/e-multi-config-dialog.h
@@ -31,10 +31,7 @@
 
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_MULTI_CONFIG_DIALOG			(e_multi_config_dialog_get_type ())
 #define E_MULTI_CONFIG_DIALOG(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MULTI_CONFIG_DIALOG, EMultiConfigDialog))
@@ -69,8 +66,6 @@ void  e_multi_config_dialog_add_page  (EMultiConfigDialog *dialog,
 void  e_multi_config_dialog_show_page (EMultiConfigDialog *dialog,
 				       gint                 page);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_MULTI_CONFIG_DIALOG_H_ */
diff --git a/widgets/misc/e-reflow-model.h b/widgets/misc/e-reflow-model.h
index d606edf8cd..ebbf3c1f75 100644
--- a/widgets/misc/e-reflow-model.h
+++ b/widgets/misc/e-reflow-model.h
@@ -27,9 +27,7 @@
 #include <glib-object.h>
 #include <libgnomecanvas/gnome-canvas.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_REFLOW_MODEL_TYPE        (e_reflow_model_get_type ())
 #define E_REFLOW_MODEL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_REFLOW_MODEL_TYPE, EReflowModel))
@@ -105,8 +103,6 @@ void             e_reflow_model_item_removed       (EReflowModel     *e_reflow_m
 void             e_reflow_model_item_changed       (EReflowModel     *e_reflow_model,
 						    gint               n);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_REFLOW_MODEL_H_ */
diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h
index 69527bdf05..19e6d4a709 100644
--- a/widgets/misc/e-reflow.h
+++ b/widgets/misc/e-reflow.h
@@ -28,10 +28,7 @@
 #include <misc/e-selection-model.h>
 #include <e-util/e-sorter-array.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* EReflow - A canvas item container.
  *
@@ -139,8 +136,6 @@ struct _EReflowClass
  */
 GType    e_reflow_get_type       (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __E_REFLOW_H__ */
diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h
index be21a5557e..3f69fca342 100644
--- a/widgets/misc/e-selection-model-array.h
+++ b/widgets/misc/e-selection-model-array.h
@@ -28,9 +28,7 @@
 #include <misc/e-selection-model.h>
 #include <e-util/e-bit-array.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_SELECTION_MODEL_ARRAY_TYPE        (e_selection_model_array_get_type ())
 #define E_SELECTION_MODEL_ARRAY(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_SELECTION_MODEL_ARRAY_TYPE, ESelectionModelArray))
@@ -89,9 +87,7 @@ void     e_selection_model_array_confirm_row_count  (ESelectionModelArray *esm);
 /* Protected Virtual Function */
 gint     e_selection_model_array_get_row_count      (ESelectionModelArray *esm);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* _E_SELECTION_MODEL_ARRAY_H_ */
diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h
index 8db463b32f..2433543ade 100644
--- a/widgets/misc/e-selection-model-simple.h
+++ b/widgets/misc/e-selection-model-simple.h
@@ -26,9 +26,7 @@
 
 #include <misc/e-selection-model-array.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_SELECTION_MODEL_SIMPLE_TYPE        (e_selection_model_simple_get_type ())
 #define E_SELECTION_MODEL_SIMPLE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_SELECTION_MODEL_SIMPLE_TYPE, ESelectionModelSimple))
@@ -62,9 +60,7 @@ void                   e_selection_model_simple_move_row       (ESelectionModelS
 void                   e_selection_model_simple_set_row_count  (ESelectionModelSimple *selection,
 								gint                    row_count);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_SELECTION_MODEL_SIMPLE_H_ */
 
diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h
index 16194000a5..c87ccf960e 100644
--- a/widgets/misc/e-selection-model.h
+++ b/widgets/misc/e-selection-model.h
@@ -27,9 +27,7 @@
 #include <gtk/gtk.h>
 #include <e-util/e-sorter.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_SELECTION_MODEL_TYPE         (e_selection_model_get_type ())
 #define E_SELECTION_MODEL(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), E_SELECTION_MODEL_TYPE, ESelectionModel))
@@ -160,9 +158,7 @@ void      e_selection_model_selection_row_changed  (ESelectionModel *selection,
 						    gint              row);
 void      e_selection_model_selection_changed      (ESelectionModel *selection);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* _E_SELECTION_MODEL_H_ */
diff --git a/widgets/misc/e-task-bar.h b/widgets/misc/e-task-bar.h
index f208603b63..d88c0697dd 100644
--- a/widgets/misc/e-task-bar.h
+++ b/widgets/misc/e-task-bar.h
@@ -27,10 +27,7 @@
 
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_TASK_BAR			(e_task_bar_get_type ())
 #define E_TASK_BAR(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TASK_BAR, ETaskBar))
@@ -74,8 +71,6 @@ void	    e_task_bar_remove_task_from_id (ETaskBar *task_bar,
 ETaskWidget *e_task_bar_get_task_widget  (ETaskBar    *task_bar,
 					  gint          n);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_TASK_BAR_H_ */
diff --git a/widgets/misc/e-task-widget.h b/widgets/misc/e-task-widget.h
index c023d45030..b650bd8ac5 100644
--- a/widgets/misc/e-task-widget.h
+++ b/widgets/misc/e-task-widget.h
@@ -25,10 +25,7 @@
 
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_TASK_WIDGET			(e_task_widget_get_type ())
 #define E_TASK_WIDGET(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TASK_WIDGET, ETaskWidget))
@@ -75,8 +72,6 @@ void		e_task_wiget_alert		(ETaskWidget *task_widget);
 void		e_task_wiget_unalert		(ETaskWidget *task_widget);
 const gchar *	e_task_widget_get_component_id	(ETaskWidget *task_widget);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_TASK_WIDGET_H_ */
diff --git a/widgets/misc/e-url-entry.h b/widgets/misc/e-url-entry.h
index a4edc51df2..e5c83323db 100644
--- a/widgets/misc/e-url-entry.h
+++ b/widgets/misc/e-url-entry.h
@@ -29,10 +29,7 @@
 
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_URL_ENTRY			(e_url_entry_get_type ())
 #define E_URL_ENTRY(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_URL_ENTRY, EUrlEntry))
@@ -61,8 +58,6 @@ GType      e_url_entry_get_type  (void);
 GtkWidget *e_url_entry_new       (void);
 GtkWidget *e_url_entry_get_entry (EUrlEntry *url_entry);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_URL_ENTRY_H_ */
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_ */