diff options
Diffstat (limited to 'addressbook/gui')
-rw-r--r-- | addressbook/gui/widgets/a11y/ea-addressbook-view.h | 9 | ||||
-rw-r--r-- | addressbook/gui/widgets/a11y/ea-minicard-view.h | 9 | ||||
-rw-r--r-- | addressbook/gui/widgets/a11y/ea-minicard.h | 9 | ||||
-rw-r--r-- | addressbook/gui/widgets/e-minicard-label.h | 9 | ||||
-rw-r--r-- | addressbook/gui/widgets/e-minicard.h | 9 | ||||
-rw-r--r-- | addressbook/gui/widgets/eab-config.h | 9 |
6 files changed, 12 insertions, 42 deletions
diff --git a/addressbook/gui/widgets/a11y/ea-addressbook-view.h b/addressbook/gui/widgets/a11y/ea-addressbook-view.h index f223f24a0c..4607746337 100644 --- a/addressbook/gui/widgets/a11y/ea-addressbook-view.h +++ b/addressbook/gui/widgets/a11y/ea-addressbook-view.h @@ -26,10 +26,7 @@ #include <gtk/gtk.h> #include "e-addressbook-view.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define EA_TYPE_AB_VIEW (ea_ab_view_get_type ()) #define EA_AB_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_AB_VIEW, EaABView)) @@ -54,9 +51,7 @@ struct _EaABViewClass GType ea_ab_view_get_type (void); AtkObject* ea_ab_view_new(GObject *obj); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EA_ADDRESSBOOK_VIEW_H__ */ diff --git a/addressbook/gui/widgets/a11y/ea-minicard-view.h b/addressbook/gui/widgets/a11y/ea-minicard-view.h index f20ef4487b..c564dac8c8 100644 --- a/addressbook/gui/widgets/a11y/ea-minicard-view.h +++ b/addressbook/gui/widgets/a11y/ea-minicard-view.h @@ -26,10 +26,7 @@ #include <atk/atkgobjectaccessible.h> #include "e-minicard-view.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define EA_TYPE_MINICARD_VIEW (ea_minicard_view_get_type ()) #define EA_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_MINICARD_VIEW, EaMinicardView)) @@ -56,9 +53,7 @@ GType ea_minicard_view_get_type (void); AtkObject* ea_minicard_view_new(GObject *obj); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EA_MINICARD_VIEW_H__ */ diff --git a/addressbook/gui/widgets/a11y/ea-minicard.h b/addressbook/gui/widgets/a11y/ea-minicard.h index 15f89e19c3..879463b629 100644 --- a/addressbook/gui/widgets/a11y/ea-minicard.h +++ b/addressbook/gui/widgets/a11y/ea-minicard.h @@ -27,10 +27,7 @@ #include "e-minicard.h" #include "e-minicard-label.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #define EA_TYPE_MINICARD (ea_minicard_get_type ()) #define EA_MINICARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EA_TYPE_MINICARD, EaMinicard)) @@ -55,9 +52,7 @@ struct _EaMinicardClass GType ea_minicard_get_type (void); AtkObject* ea_minicard_new(GObject *obj); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __EA_MINICARD_H__ */ diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h index f6b0607ca6..df68210473 100644 --- a/addressbook/gui/widgets/e-minicard-label.h +++ b/addressbook/gui/widgets/e-minicard-label.h @@ -26,10 +26,7 @@ #include <glib.h> #include <libgnomecanvas/gnome-canvas.h> -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* EMinicardLabel - A label doing focus with non-marching ants. * @@ -81,9 +78,7 @@ GType e_minicard_label_get_type (void); GnomeCanvasItem *e_minicard_label_new(GnomeCanvasGroup *parent); void e_minicard_label_construct (GnomeCanvasItem *item); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_MINICARD_LABEL_H__ */ diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h index 267e15128d..82cd2c6f8b 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -27,10 +27,7 @@ #include <libgnomecanvas/gnome-canvas.h> #include <libebook/e-contact.h> -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* EMinicard - A small card displaying information about a contact. * @@ -125,9 +122,7 @@ gint e_minicard_selected (EMinicard *minicard, GdkEvent *event); void e_minicard_activate_editor (EMinicard *minicard); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __E_MINICARD_H__ */ diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index edc13bbb1b..8ecc8525bc 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -28,10 +28,7 @@ #include "e-util/e-config.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif +G_BEGIN_DECLS typedef struct _EABConfig EABConfig; typedef struct _EABConfigClass EABConfigClass; @@ -78,8 +75,6 @@ struct _EABConfigHookClass { GType eab_config_hook_get_type (void); -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif |