diff options
Diffstat (limited to 'widgets')
28 files changed, 56 insertions, 176 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/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_ */ diff --git a/widgets/table/a11y/gal-a11y-e-cell-toggle.h b/widgets/table/a11y/gal-a11y-e-cell-toggle.h index 1f41ae1623..8e9b4def08 100644 --- a/widgets/table/a11y/gal-a11y-e-cell-toggle.h +++ b/widgets/table/a11y/gal-a11y-e-cell-toggle.h @@ -26,9 +26,7 @@ #include "gal-a11y-e-cell.h" #include "gal-a11y-e-cell-toggle.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAL_A11Y_TYPE_E_CELL_TOGGLE (gal_a11y_e_cell_toggle_get_type ()) #define GAL_A11Y_E_CELL_TOGGLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_TOGGLE, GalA11yECellToggle)) @@ -60,9 +58,7 @@ AtkObject *gal_a11y_e_cell_toggle_new (ETableItem *item, gint view_col, gint row); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GAL_A11Y_E_CELL_TOGGLE_H__ */ diff --git a/widgets/table/a11y/gal-a11y-e-cell-vbox.h b/widgets/table/a11y/gal-a11y-e-cell-vbox.h index b8f8bdd77d..657cb5d9a5 100644 --- a/widgets/table/a11y/gal-a11y-e-cell-vbox.h +++ b/widgets/table/a11y/gal-a11y-e-cell-vbox.h @@ -27,9 +27,7 @@ #include "gal-a11y-e-cell.h" -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAL_A11Y_TYPE_E_CELL_VBOX (gal_a11y_e_cell_vbox_get_type ()) #define GAL_A11Y_E_CELL_VBOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_VBOX, GalA11yECellVbox)) @@ -61,7 +59,5 @@ AtkObject *gal_a11y_e_cell_vbox_new (ETableItem *item, gint view_col, gint row); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GAL_A11Y_E_CELL_VBOX_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_ */ diff --git a/widgets/text/e-reflow-model.h b/widgets/text/e-reflow-model.h index d606edf8cd..ebbf3c1f75 100644 --- a/widgets/text/e-reflow-model.h +++ b/widgets/text/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/text/e-reflow.h b/widgets/text/e-reflow.h index 89ceb032b1..234dbc16a2 100644 --- a/widgets/text/e-reflow.h +++ b/widgets/text/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__ */ |