port to gnome 2.

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

	* backend/pas/pas-backend-card-sexp.[ch]: port to gnome 2.

	* backend/pas/pas-backend-file.[ch]: same.

	* backend/pas/pas-backend-file.[ch]: same.

	* backend/pas/pas-backend-ldap.[ch]: same.

	* backend/pas/pas-backend-summary.[ch]: same.

	* backend/pas/pas-backend.[ch]: same.

	* backend/pas/pas-book-factory.[ch]: same.

	* backend/pas/pas-book-view.[ch]: same.

	* backend/pas/pas-book.[ch]: same.

	* backend/pas/pas-card-cursor.[ch]: same.

	* backend/pas/pas-marshal.list: list of marshallers.

	* backend/pas/Makefile.am (libpas_a_SOURCES): add pas-marshal.c
	also add the marshal building foo.

	* backend/pas/.cvsignore: ignore pas-marshal.[ch]

svn path=/trunk/; revision=18544

1 files changed, 22 insertions, 12 deletions

diff --git a/addressbook/backend/pas/pas-card-cursor.h b/addressbook/backend/pas/pas-card-cursor.h
index 70ecb5e718..880632decd 100644
--- a/addressbook/backend/pas/pas-card-cursor.h
+++ b/addressbook/backend/pas/pas-card-cursor.h
@@ -10,11 +10,17 @@
 #ifndef __PAS_CARD_CURSOR_H__
 #define __PAS_CARD_CURSOR_H__
 
-#include <libgnome/gnome-defs.h>
 #include <bonobo/bonobo-object.h>
 #include <pas/addressbook.h>
 
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
+
+#define PAS_TYPE_CARD_CURSOR        (pas_card_cursor_get_type ())
+#define PAS_CARD_CURSOR(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), PAS_TYPE_CARD_CURSOR, PASCardCursor))
+#define PAS_CARD_CURSOR_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), PAS_TYPE_CARD_CURSOR, PASCardCursorClass))
+#define PAS_IS_CARD_CURSOR(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), PAS_TYPE_CARD_CURSOR))
+#define PAS_IS_CARD_CURSOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), PAS_TYPE_CARD_CURSOR))
+#define PAS_CARD_CURSOR_GET_CLASS(k) (G_TYPE_INSTANCE_GET_CLASS ((obj), PAS_TYPE_CARD_CURSOR, PASCardCursorClass))
 
 typedef struct _PASCardCursor        PASCardCursor;
 typedef struct _PASCardCursorPrivate PASCardCursorPrivate;
@@ -30,29 +36,33 @@ struct _PASCardCursor {
 
 struct _PASCardCursorClass {
 	BonoboObjectClass parent;
+
+	POA_GNOME_Evolution_Addressbook_CardCursor__epv epv;
+};
+
+
+struct _PASCardCursorServant {
+	POA_GNOME_Evolution_Addressbook_CardCursor servant_placeholder;
+	PASCardCursor *object;
 };
+typedef struct _PASCardCursorServant PASCardCursorServant;
+
+
 
 /* Creating a new addressbook. */
 PASCardCursor *pas_card_cursor_new       (PASCardCursorLengthFunc  get_length,
 				          PASCardCursorNthFunc     get_nth,
 					  gpointer data);
-PASCardCursor *pas_card_cursor_construct (PASCardCursor           *cursor,
+void           pas_card_cursor_construct (PASCardCursor           *cursor,
 					  GNOME_Evolution_Addressbook_CardCursor     corba_cursor,
 					  PASCardCursorLengthFunc  get_length,
 					  PASCardCursorNthFunc     get_nth,
 					  gpointer data);
 
-GtkType        pas_card_cursor_get_type  (void);
+GType          pas_card_cursor_get_type  (void);
 POA_GNOME_Evolution_Addressbook_CardCursor__epv *
                pas_card_cursor_get_epv   (void);
 
-/* Fetching cards. */
-#define PAS_CARD_CURSOR_TYPE        (pas_card_cursor_get_type ())
-#define PAS_CARD_CURSOR(o)          (GTK_CHECK_CAST ((o), PAS_CARD_CURSOR_TYPE, PASCardCursor))
-#define PAS_CARD_CURSOR_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_CARD_CURSOR_TYPE, PASCardCursorClass))
-#define PAS_IS_CARD_CURSOR(o)       (GTK_CHECK_TYPE ((o), PAS_CARD_CURSOR_TYPE))
-#define PAS_IS_CARD_CURSOR_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_CARD_CURSOR_TYPE))
-
-END_GNOME_DECLS
+G_END_DECLS
 
 #endif /* ! __PAS_CARD_CURSOR_H__ */