diff options
Diffstat (limited to 'addressbook/gui/contact-editor/e-contact-editor.h')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index 0010182b99..eb3b294af8 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/contact-editor/e-contact-editor.h @@ -30,10 +30,7 @@ #include "addressbook/backend/ebook/e-card.h" #include "addressbook/backend/ebook/e-card-simple.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* EContactEditor - A dialog displaying information about a contact. * @@ -44,11 +41,11 @@ extern "C" { * card ECard * RW The card currently being edited */ -#define E_CONTACT_EDITOR_TYPE (e_contact_editor_get_type ()) -#define E_CONTACT_EDITOR(obj) (GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_TYPE, EContactEditor)) -#define E_CONTACT_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_TYPE, EContactEditorClass)) -#define E_IS_CONTACT_EDITOR(obj) (GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_TYPE)) -#define E_IS_CONTACT_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_TYPE)) +#define E_TYPE_CONTACT_EDITOR (e_contact_editor_get_type ()) +#define E_CONTACT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CONTACT_EDITOR, EContactEditor)) +#define E_CONTACT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CONTACT_EDITOR, EContactEditorClass)) +#define E_IS_CONTACT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_EDITOR)) +#define E_IS_CONTACT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_EDITOR)) typedef struct _EContactEditor EContactEditor; @@ -121,7 +118,7 @@ EContactEditor *e_contact_editor_new (EBook *book, ECard *card, gboolean is_new_card, gboolean editable); -GtkType e_contact_editor_get_type (void); +GType e_contact_editor_get_type (void); void e_contact_editor_show (EContactEditor *editor); void e_contact_editor_close (EContactEditor *editor); @@ -131,9 +128,6 @@ gboolean e_contact_editor_confirm_delete (GtkWindow *parent); gboolean e_contact_editor_request_close_all (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __E_CONTACT_EDITOR_H__ */ |