Use G_BEGIN_DECLS / G_END_DECLS macros.

10 files changed, 20 insertions, 63 deletions

diff --git a/widgets/misc/a11y/ea-calendar-cell.h b/widgets/misc/a11y/ea-calendar-cell.h
index be35c66312..fa68fdca55 100644
--- a/widgets/misc/a11y/ea-calendar-cell.h
+++ b/widgets/misc/a11y/ea-calendar-cell.h
@@ -26,9 +26,7 @@
 #include <atk/atkgobjectaccessible.h>
 #include "misc/e-calendar-item.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define E_TYPE_CALENDAR_CELL                     (e_calendar_cell_get_type ())
 #define E_CALENDAR_CELL(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CALENDAR_CELL, ECalendarCell))
@@ -83,8 +81,6 @@ struct _EaCalendarCellClass
 
 AtkObject*     ea_calendar_cell_new         (GObject *gobj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __EA_CALENDAR_CELL_H__ */
diff --git a/widgets/misc/a11y/ea-calendar-item.h b/widgets/misc/a11y/ea-calendar-item.h
index b5f1b0ce81..36cc671a3b 100644
--- a/widgets/misc/a11y/ea-calendar-item.h
+++ b/widgets/misc/a11y/ea-calendar-item.h
@@ -26,9 +26,7 @@
 #include <atk/atkgobjectaccessible.h>
 #include <misc/e-calendar-item.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define EA_TYPE_CALENDAR_ITEM                   (ea_calendar_item_get_type ())
 #define EA_CALENDAR_ITEM(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_CALENDAR_ITEM, EaCalendarItem))
@@ -64,9 +62,7 @@ gboolean e_calendar_item_get_date_for_offset (ECalendarItem *calitem,
 gint e_calendar_item_get_n_days_from_week_start (ECalendarItem *calitem,
 						 gint year, gint month);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 
 #endif /* __EA_CALENDAR_ITEM_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 d6b9f653d8..c281e7436b 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
@@ -110,8 +108,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-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-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_ */