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, 26 insertions, 8 deletions

diff --git a/addressbook/backend/pas/pas-book-view.h b/addressbook/backend/pas/pas-book-view.h
index 712f3c3b96..7948baf1ea 100644
--- a/addressbook/backend/pas/pas-book-view.h
+++ b/addressbook/backend/pas/pas-book-view.h
@@ -13,8 +13,16 @@
 #define __PAS_BOOK_VIEW_H__
 
 #include <bonobo/bonobo-object.h>
-#include <libgnome/gnome-defs.h>
 #include <pas/addressbook.h>
+#include <glib.h>
+#include <glib-object.h>
+
+#define PAS_TYPE_BOOK_VIEW        (pas_book_view_get_type ())
+#define PAS_BOOK_VIEW(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), PAS_TYPE_BOOK_VIEW, PASBookView))
+#define PAS_BOOK_VIEW_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), PAS_TYPE_BOOK_VIEW, PASBookViewClass))
+#define PAS_IS_BOOK_VIEW(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), PAS_TYPE_BOOK_VIEW))
+#define PAS_IS_BOOK_VIEW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), PAS_TYPE_BOOK_VIEW))
+#define PAS_BOOK_VIEW_GET_CLASS(k) (G_TYPE_INSTANCE_GET_CLASS ((obj), PAS_TYPE_BOOK_VIEW, PASBookView))
 
 typedef struct _PASBookView        PASBookView;
 typedef struct _PASBookViewClass   PASBookViewClass;
@@ -27,8 +35,24 @@ struct _PASBookView {
 
 struct _PASBookViewClass {
 	BonoboObjectClass parent_class;
+
+	POA_GNOME_Evolution_Addressbook_BookView__epv epv;
+};
+
+
+
+struct _PASBookViewServant {
+	POA_GNOME_Evolution_Addressbook_BookView servant_placeholder;
+	PASBookView *object;
 };
+typedef struct _PASBookViewServant PASBookViewServant;
+
+
+
 PASBookView *pas_book_view_new                    (GNOME_Evolution_Addressbook_BookViewListener  listener);
+void         pas_book_view_construct              (PASBookView                *book_view,
+						   GNOME_Evolution_Addressbook_BookView corba_objref,
+						   GNOME_Evolution_Addressbook_BookViewListener  listener);
 
 void         pas_book_view_notify_change          (PASBookView                *book_view,
 						   const GList                *cards);
@@ -45,12 +69,6 @@ void         pas_book_view_notify_complete        (PASBookView                *b
 void         pas_book_view_notify_status_message  (PASBookView                *book_view,
 						   const char                 *message);
 
-GtkType      pas_book_view_get_type               (void);
-
-#define PAS_BOOK_VIEW_TYPE        (pas_book_view_get_type ())
-#define PAS_BOOK_VIEW(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_VIEW_TYPE, PASBookView))
-#define PAS_BOOK_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_VIEW_FACTORY_TYPE, PASBookViewClass))
-#define PAS_IS_BOOK_VIEW(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_VIEW_TYPE))
-#define PAS_IS_BOOK_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_VIEW_TYPE))
+GType      pas_book_view_get_type               (void);
 
 #endif /* ! __PAS_BOOK_VIEW_H__ */