diff options
Diffstat (limited to 'addressbook/backend/ebook/e-card-cursor.h')
| -rw-r--r-- | addressbook/backend/ebook/e-card-cursor.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/addressbook/backend/ebook/e-card-cursor.h b/addressbook/backend/ebook/e-card-cursor.h index d6e7625941..b8da39f023 100644 --- a/addressbook/backend/ebook/e-card-cursor.h +++ b/addressbook/backend/ebook/e-card-cursor.h @@ -10,24 +10,31 @@ #ifndef __E_CARD_CURSOR_H__ #define __E_CARD_CURSOR_H__ -#include <gtk/gtkobject.h> -#include <libgnome/gnome-defs.h> +#include <glib.h> +#include <glib-object.h> #include <ebook/addressbook.h> #include <ebook/e-card.h> -BEGIN_GNOME_DECLS +#define E_TYPE_CARD_CURSOR (e_card_cursor_get_type ()) +#define E_CARD_CURSOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_CARD_CURSOR, ECardCursor)) +#define E_CARD_CURSOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_CARD_CURSOR, ECardCursorClass)) +#define E_IS_CARD_CURSOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_CARD_CURSOR)) +#define E_IS_CARD_CURSOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_CARD_CURSOR)) +#define E_CARD_CURSOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_CARD_CURSOR, ECardCursorClass)) + +G_BEGIN_DECLS typedef struct _ECardCursor ECardCursor; typedef struct _ECardCursorPrivate ECardCursorPrivate; typedef struct _ECardCursorClass ECardCursorClass; struct _ECardCursor { - GtkObject parent; + GObject parent; ECardCursorPrivate *priv; }; struct _ECardCursorClass { - GtkObjectClass parent; + GObjectClass parent; }; /* Creating a new addressbook. */ @@ -35,18 +42,12 @@ ECardCursor *e_card_cursor_new (GNOME_Evolution_Addressbook_CardCursor co ECardCursor *e_card_cursor_construct (ECardCursor *cursor, GNOME_Evolution_Addressbook_CardCursor corba_cursor); -GtkType e_card_cursor_get_type (void); +GType e_card_cursor_get_type (void); /* Fetching cards. */ long e_card_cursor_get_length (ECardCursor *cursor); ECard *e_card_cursor_get_nth (ECardCursor *cursor, const long nth); -#define E_CARD_CURSOR_TYPE (e_card_cursor_get_type ()) -#define E_CARD_CURSOR(o) (GTK_CHECK_CAST ((o), E_CARD_CURSOR_TYPE, ECardCursor)) -#define E_CARD_CURSOR_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_CARD_CURSOR_TYPE, ECardCursorClass)) -#define E_IS_CARD_CURSOR(o) (GTK_CHECK_TYPE ((o), E_CARD_CURSOR_TYPE)) -#define E_IS_CARD_CURSOR_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CARD_CURSOR_TYPE)) - -END_GNOME_DECLS +G_END_DECLS #endif /* ! __E_CARD_CURSOR_H__ */ |