diff options
Diffstat (limited to 'addressbook/backend/ebook/e-card-simple.h')
| -rw-r--r-- | addressbook/backend/ebook/e-card-simple.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/addressbook/backend/ebook/e-card-simple.h b/addressbook/backend/ebook/e-card-simple.h index 53c1d13164..9e77a43ae1 100644 --- a/addressbook/backend/ebook/e-card-simple.h +++ b/addressbook/backend/ebook/e-card-simple.h @@ -13,17 +13,18 @@ #define __E_CARD_SIMPLE_H__ #include <time.h> -#include <gtk/gtk.h> +#include <glib-object.h> #include <stdio.h> #include <ebook/e-card.h> #include <ebook/e-card-types.h> #include <e-util/e-list.h> #define E_TYPE_CARD_SIMPLE (e_card_simple_get_type ()) -#define E_CARD_SIMPLE(obj) (GTK_CHECK_CAST ((obj), E_TYPE_CARD_SIMPLE, ECardSimple)) -#define E_CARD_SIMPLE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD_SIMPLE, ECardSimpleClass)) -#define E_IS_CARD_SIMPLE(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_CARD_SIMPLE)) -#define E_IS_CARD_SIMPLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD_SIMPLE)) +#define E_CARD_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CARD_SIMPLE, ECardSimple)) +#define E_CARD_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CARD_SIMPLE, ECardSimpleClass)) +#define E_IS_CARD_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CARD_SIMPLE)) +#define E_IS_CARD_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD_SIMPLE)) +#define E_CARD_SIMPLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_CARD_SIMPLE, ECardSimpleClass)) typedef enum _ECardSimplePhoneId ECardSimplePhoneId; typedef enum _ECardSimpleEmailId ECardSimpleEmailId; @@ -137,7 +138,7 @@ typedef struct _ECardSimple ECardSimple; typedef struct _ECardSimpleClass ECardSimpleClass; struct _ECardSimple { - GtkObject object; + GObject object; ECard *card; GList *temp_fields; @@ -151,7 +152,7 @@ struct _ECardSimple { }; struct _ECardSimpleClass { - GtkObjectClass parent_class; + GObjectClass parent_class; }; typedef void (*ECardSimpleArbitraryCallback) (const ECardArbitrary *arbitrary, gpointer closure); @@ -225,8 +226,7 @@ ECardSimpleField e_card_simple_map_phone_to_field (ECardSimplePho ECardSimpleField e_card_simple_map_email_to_field (ECardSimpleEmailId email_id); ECardSimpleField e_card_simple_map_address_to_field (ECardSimpleAddressId address_id); -/* Standard Gtk function */ -GtkType e_card_simple_get_type (void); +GType e_card_simple_get_type (void); #endif /* ! __E_CARD_SIMPLE_H__ */ |