just include glib.h instead of the gtk stuff.

2002-11-02  Chris Toshok  <toshok@ximian.com>

	* backend/ebook/e-book-types.h: just include glib.h instead of the
	gtk stuff.

	* backend/ebook/e-book-listener.[ch]: convert to
	GObject/bonobo-activation/etc/etc.
	* e-book-util.[ch]: same.
	* e-book-view-listener.[ch]: same.
	* e-book-view.[ch]: same.
	* e-book.[ch]: same.
	* e-card-compare.[ch]: same.
	* e-card-cursor.[ch]: same.
	* e-card-simple.[ch]: same.
	* e-card.[ch]: same.
	* e-destination.[ch]: same.
	* evolution-ldif-importer.c: same.
	* evolution-vcard-importer.c: same.
	* load-gnomecard-addressbook.c: same.
	* load-pine-addressbok.c: same.
	* test-card.c: same.
	* test-client-list.c: same.
	* test-client.c: same.

	* backend/ebook/Makefile.am: add e-book-marshal.c to SOURCES, add
	e-book-marshal.[ch] to CLEANFILES, and add e-book-marshal.list to
	EXTRA_DIST.  Also, remove the camel libs from the test LDADD's,
	and leave e-destination.[ch] out of the build.

	* backend/ebook/.cvsignore: ignore e-book-marshal.[ch]

	* backend/ebook/e-book-marshal.list: marshallers for e-book.

svn path=/trunk/; revision=18505

1 files changed, 9 insertions, 9 deletions

diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h
index e9b3701149..1221a35e65 100644
--- a/addressbook/backend/ebook/e-card.h
+++ b/addressbook/backend/ebook/e-card.h
@@ -13,16 +13,17 @@
 #define __E_CARD_H__
 
 #include <time.h>
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <stdio.h>
 #include <ebook/e-card-types.h>
 #include <e-util/e-list.h>
 
 #define E_TYPE_CARD            (e_card_get_type ())
-#define E_CARD(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD, ECard))
-#define E_CARD_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD, ECardClass))
-#define E_IS_CARD(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD))
-#define E_IS_CARD_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD))
+#define E_CARD(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CARD, ECard))
+#define E_CARD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CARD, ECardClass))
+#define E_IS_CARD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CARD))
+#define E_IS_CARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD))
+#define E_CARD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_CARD, ECardClass))
 
 typedef struct _ECard ECard;
 typedef struct _ECardClass ECardClass;
@@ -30,7 +31,7 @@ typedef struct _ECardClass ECardClass;
 struct _EBook; /* Forward reference */
 
 struct _ECard {
-	GtkObject object;
+	GObject object;
 	char *id;
 
 	struct _EBook   *book;          /* The EBook this card is from.     */
@@ -111,7 +112,7 @@ struct _ECard {
 };
 
 struct _ECardClass {
-	GtkObjectClass parent_class;
+	GObjectClass parent_class;
 	GHashTable    *attribute_jump_table;
 };
 
@@ -212,7 +213,6 @@ void                  e_card_load_uri                       (const gchar
 							     gpointer                    closure);
 
 
-/* Standard Gtk function */
-GtkType               e_card_get_type                       (void);
+GType               e_card_get_type                         (void);
 
 #endif /* ! __E_CARD_H__ */