aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/misc')
-rw-r--r--widgets/misc/e-activity-handler.h9
-rw-r--r--widgets/misc/e-calendar-item.h8
-rw-r--r--widgets/misc/e-calendar.h8
-rw-r--r--widgets/misc/e-canvas-vbox.h9
-rw-r--r--widgets/misc/e-canvas.h9
-rw-r--r--widgets/misc/e-combo-button.h9
-rw-r--r--widgets/misc/e-config-page.h9
-rw-r--r--widgets/misc/e-dropdown-button.h9
-rw-r--r--widgets/misc/e-filter-bar.h9
-rw-r--r--widgets/misc/e-info-label.h9
-rw-r--r--widgets/misc/e-multi-config-dialog.h9
-rw-r--r--widgets/misc/e-reflow-model.h8
-rw-r--r--widgets/misc/e-reflow.h9
-rw-r--r--widgets/misc/e-selection-model-array.h8
-rw-r--r--widgets/misc/e-selection-model-simple.h8
-rw-r--r--widgets/misc/e-selection-model.h8
-rw-r--r--widgets/misc/e-task-bar.h9
-rw-r--r--widgets/misc/e-task-widget.h9
-rw-r--r--widgets/misc/e-url-entry.h9
19 files changed, 38 insertions, 127 deletions
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_ */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 00:10:00 +0800