aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/e-component-registry.h9
-rw-r--r--shell/e-component-view.h9
-rw-r--r--shell/e-corba-config-page.h9
-rw-r--r--shell/e-shell-settings-dialog.h9
-rw-r--r--shell/e-shell-view.h9
-rw-r--r--shell/e-shell.h9
-rw-r--r--shell/e-user-creatable-items-handler.h9
-rw-r--r--shell/es-event.h9
-rw-r--r--shell/es-menu.h9
-rw-r--r--shell/evolution-shell-component-utils.h9
-rw-r--r--shell/importer/evolution-importer-client.h9
-rw-r--r--shell/importer/evolution-importer-listener.h9
-rw-r--r--shell/importer/evolution-importer.h9
-rw-r--r--shell/importer/evolution-intelligent-importer.h9
14 files changed, 28 insertions, 98 deletions
diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h
index c8c292a935..1b4dd978bb 100644
--- a/shell/e-component-registry.h
+++ b/shell/e-component-registry.h
@@ -29,10 +29,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define E_TYPE_COMPONENT_REGISTRY (e_component_registry_get_type ())
@@ -97,8 +94,6 @@ GNOME_Evolution_Component e_component_registry_activate (EComponentRegistry *r
CORBA_Environment *ev);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* __E_COMPONENT_REGISTRY_H__ */
diff --git a/shell/e-component-view.h b/shell/e-component-view.h
index 9b741837b1..ef8a6e813c 100644
--- a/shell/e-component-view.h
+++ b/shell/e-component-view.h
@@ -26,10 +26,7 @@
#include <bonobo/bonobo-object.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
struct _GtkWidget;
@@ -71,9 +68,7 @@ EComponentView *e_component_view_new_controls(GNOME_Evolution_ShellView parent,
void e_component_view_set_title(EComponentView *ecv, const gchar *title);
void e_component_view_set_button_icon (EComponentView *ecv, const gchar *iconName);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* _E_COMPONENT_VIEW_H_ */
diff --git a/shell/e-corba-config-page.h b/shell/e-corba-config-page.h
index 8f0690ff69..a09b86d0fe 100644
--- a/shell/e-corba-config-page.h
+++ b/shell/e-corba-config-page.h
@@ -29,10 +29,7 @@
#include <bonobo/bonobo-object.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define E_TYPE_CORBA_CONFIG_PAGE (e_corba_config_page_get_type ())
#define E_CORBA_CONFIG_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CORBA_CONFIG_PAGE, ECorbaConfigPage))
@@ -61,8 +58,6 @@ GtkWidget *e_corba_config_page_new_from_objref (GNOME_Evolution_ConfigControl
gboolean e_corba_config_page_construct (ECorbaConfigPage *corba_config_page,
GNOME_Evolution_ConfigControl objref);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* _E_CORBA_CONFIG_PAGE_H_ */
diff --git a/shell/e-shell-settings-dialog.h b/shell/e-shell-settings-dialog.h
index ba636e6071..b39bc7beb3 100644
--- a/shell/e-shell-settings-dialog.h
+++ b/shell/e-shell-settings-dialog.h
@@ -26,10 +26,7 @@
#include "e-multi-config-dialog.h"
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define E_TYPE_SHELL_SETTINGS_DIALOG (e_shell_settings_dialog_get_type ())
#define E_SHELL_SETTINGS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SHELL_SETTINGS_DIALOG, EShellSettingsDialog))
@@ -58,8 +55,6 @@ GtkWidget *e_shell_settings_dialog_new (void);
void e_shell_settings_dialog_show_type (EShellSettingsDialog *dialog,
const gchar *type);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* _E_SHELL_SETTINGS_DIALOG_H_ */
diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
index dd500efa94..1ca2656bb0 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.h
@@ -26,10 +26,7 @@
#include <bonobo-activation/bonobo-activation.h>
#include <bonobo/bonobo-object.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
struct _EShell;
@@ -62,9 +59,7 @@ struct _EShellViewClass {
GType e_shell_view_get_type (void);
EShellView *e_shell_view_new(struct _EShellWindow *window);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* _E_SHELL_VIEW_H_ */
diff --git a/shell/e-shell.h b/shell/e-shell.h
index 4f26846071..c5ae461466 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -26,10 +26,7 @@
#include <bonobo-activation/bonobo-activation.h>
#include <bonobo/bonobo-object.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
typedef struct _EShell EShell;
typedef struct _EShellPrivate EShellPrivate;
@@ -141,8 +138,6 @@ const gchar *e_shell_construct_result_to_string (EShellConstructResult result);
typedef gboolean (*EMainShellFunc) (EShell *shell, EShellWindow *window, gpointer user_data);
void e_shell_foreach_shell_window (EShell *shell, EMainShellFunc func, gpointer user_data);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* _E_SHELL_H_ */
diff --git a/shell/e-user-creatable-items-handler.h b/shell/e-user-creatable-items-handler.h
index 5350691eae..922c7f70d2 100644
--- a/shell/e-user-creatable-items-handler.h
+++ b/shell/e-user-creatable-items-handler.h
@@ -27,10 +27,7 @@
#include <bonobo/bonobo-ui-component.h>
#include <bonobo/bonobo-window.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define E_TYPE_USER_CREATABLE_ITEMS_HANDLER (e_user_creatable_items_handler_get_type ())
#define E_USER_CREATABLE_ITEMS_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER, EUserCreatableItemsHandler))
@@ -63,8 +60,6 @@ EUserCreatableItemsHandler *e_user_creatable_items_handler_new (const gch
void e_user_creatable_items_handler_activate (EUserCreatableItemsHandler *handler,
BonoboUIComponent *ui_component);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* _E_USER_CREATABLE_ITEMS_HANDLER_H_ */
diff --git a/shell/es-event.h b/shell/es-event.h
index 0fa2ae0484..b422151a56 100644
--- a/shell/es-event.h
+++ b/shell/es-event.h
@@ -28,10 +28,7 @@
#include "e-util/e-event.h"
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
struct _EShell; /* Avoid including "e-shell.h" */
@@ -120,8 +117,6 @@ struct _ESEventHookClass {
GType es_event_hook_get_type(void);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* __ES_EVENT_H__ */
diff --git a/shell/es-menu.h b/shell/es-menu.h
index 298de64e6e..d8ac21a567 100644
--- a/shell/es-menu.h
+++ b/shell/es-menu.h
@@ -28,10 +28,7 @@
#include "e-util/e-menu.h"
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
typedef struct _ESMenu ESMenu;
typedef struct _ESMenuClass ESMenuClass;
@@ -90,8 +87,6 @@ struct _ESMenuHookClass {
GType es_menu_hook_get_type(void);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* __ES_MENU_H__ */
diff --git a/shell/evolution-shell-component-utils.h b/shell/evolution-shell-component-utils.h
index 477643e93d..1c2412e230 100644
--- a/shell/evolution-shell-component-utils.h
+++ b/shell/evolution-shell-component-utils.h
@@ -25,10 +25,7 @@
#include <bonobo/bonobo-ui-component.h>
#include <gtk/gtk.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
typedef struct _EPixmap {
const gchar *path;
@@ -45,8 +42,6 @@ void e_pixmaps_update (BonoboUIComponent *uic, EPixmap *pixcache);
gchar *e_get_activation_failure_msg (CORBA_Environment *ev);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* __EVOLUTION_SHELL_COMPONENT_UTILS_H__ */
diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h
index 2a71e58a45..e94584216d 100644
--- a/shell/importer/evolution-importer-client.h
+++ b/shell/importer/evolution-importer-client.h
@@ -28,10 +28,7 @@
#include <importer/evolution-importer.h>
#include <importer/evolution-importer-listener.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif
+G_BEGIN_DECLS
#define EVOLUTION_TYPE_IMPORTER_CLIENT (evolution_importer_client_get_type ())
#define EVOLUTION_IMPORTER_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EVOLUTION_TYPE_IMPORTER_CLIENT, EvolutionImporterClient))
@@ -67,8 +64,6 @@ void evolution_importer_client_process_item (EvolutionImporterClient *client,
EvolutionImporterListener *listener);
const gchar *evolution_importer_client_get_error (EvolutionImporterClient *client);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif
diff --git a/shell/importer/evolution-importer-listener.h b/shell/importer/evolution-importer-listener.h
index e4df945271..39bf2a0493 100644
--- a/shell/importer/evolution-importer-listener.h
+++ b/shell/importer/evolution-importer-listener.h
@@ -28,10 +28,7 @@
#include <importer/GNOME_Evolution_Importer.h>
#include "evolution-importer.h"
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* cplusplus */
+G_BEGIN_DECLS
#define EVOLUTION_TYPE_IMPORTER_LISTENER (evolution_importer_listener_get_type ())
#define EVOLUTION_IMPORTER_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EVOLUTION_TYPE_IMPORTER_LISTENER, EvolutionImporterListener))
@@ -64,8 +61,6 @@ GType evolution_importer_listener_get_type (void);
EvolutionImporterListener *evolution_importer_listener_new (EvolutionImporterListenerCallback callback,
gpointer closure);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif
diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h
index b4bf54928f..5c7560dabd 100644
--- a/shell/importer/evolution-importer.h
+++ b/shell/importer/evolution-importer.h
@@ -27,10 +27,7 @@
#include <bonobo/bonobo-object.h>
#include <importer/GNOME_Evolution_Importer.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* cplusplus */
+G_BEGIN_DECLS
#define EVOLUTION_TYPE_IMPORTER (evolution_importer_get_type ())
#define EVOLUTION_IMPORTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EVOLUTION_TYPE_IMPORTER, EvolutionImporter))
@@ -93,8 +90,6 @@ EvolutionImporter *evolution_importer_new (EvolutionImporterCreateControlFn cre
void *closure);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif
diff --git a/shell/importer/evolution-intelligent-importer.h b/shell/importer/evolution-intelligent-importer.h
index 99d5d2b26d..d9613d3f66 100644
--- a/shell/importer/evolution-intelligent-importer.h
+++ b/shell/importer/evolution-intelligent-importer.h
@@ -27,10 +27,7 @@
#include <bonobo/bonobo-object.h>
#include <importer/GNOME_Evolution_Importer.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define EVOLUTION_TYPE_INTELLIGENT_IMPORTER (evolution_intelligent_importer_get_type ())
#define EVOLUTION_INTELLIGENT_IMPORTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EVOLUTION_TYPE_INTELLIGENT_IMPORTER, EvolutionIntelligentImporter))
@@ -67,8 +64,6 @@ EvolutionIntelligentImporter *evolution_intelligent_importer_new (EvolutionIntel
const gchar *message,
gpointer closure);
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 04:09:33 +0800