aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend/pas/pas-book-factory.h
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/backend/pas/pas-book-factory.h')
-rw-r--r--addressbook/backend/pas/pas-book-factory.h38
1 files changed, 24 insertions, 14 deletions
diff --git a/addressbook/backend/pas/pas-book-factory.h b/addressbook/backend/pas/pas-book-factory.h
index 1936701296..fd8683907c 100644
--- a/addressbook/backend/pas/pas-book-factory.h
+++ b/addressbook/backend/pas/pas-book-factory.h
@@ -2,32 +2,48 @@
* Copyright 2000, Ximian, Inc.
*/
-#include <bonobo/bonobo-object.h>
-#include <libgnome/gnome-defs.h>
-
#include <pas/pas-backend.h>
+#include <bonobo/bonobo-object.h>
#ifndef __PAS_BOOK_FACTORY_H__
#define __PAS_BOOK_FACTORY_H__
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
+
+#define PAS_TYPE_BOOK_FACTORY (pas_book_factory_get_type ())
+#define PAS_BOOK_FACTORY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PAS_TYPE_BOOK_FACTORY, PASBookFactory))
+#define PAS_BOOK_FACTORY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), PAS_TYPE_BOOK_FACTORY, PASBookFactoryClass))
+#define PAS_IS_BOOK_FACTORY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PAS_TYPE_BOOK_FACTORY))
+#define PAS_IS_BOOK_FACTORY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), PAS_TYPE_BOOK_FACTORY))
+#define PAS_BOOK_FACTORY_GET_CLASS(k) (G_TYPE_INSTANCE_GET_CLASS ((obj), PAS_TYPE_BOOK_FACTORY, PASBookFactoryClass))
typedef struct _PASBookFactoryPrivate PASBookFactoryPrivate;
typedef struct {
- BonoboObject parent_object;
+ GObject parent_object;
PASBookFactoryPrivate *priv;
} PASBookFactory;
typedef struct {
- BonoboObjectClass parent_class;
+ GObjectClass parent_class;
/* Notification signals */
void (* last_book_gone) (PASBookFactory *factory);
} PASBookFactoryClass;
+
+struct _PASBookFactoryServant {
+ POA_GNOME_Evolution_Addressbook_BookFactory servant_placeholder;
+ PASBookFactory *object;
+};
+typedef struct _PASBookFactoryServant PASBookFactoryServant;
+
+
+
PASBookFactory *pas_book_factory_new (void);
+void pas_book_factory_construct (PASBookFactory *factory,
+ GNOME_Evolution_Addressbook_BookListener corba_objref);
void pas_book_factory_register_backend (PASBookFactory *factory,
const char *proto,
@@ -39,14 +55,8 @@ void pas_book_factory_dump_active_backends (PASBookFactory *factory);
gboolean pas_book_factory_activate (PASBookFactory *factory, const char *iid);
-GtkType pas_book_factory_get_type (void);
-
-#define PAS_BOOK_FACTORY_TYPE (pas_book_factory_get_type ())
-#define PAS_BOOK_FACTORY(o) (GTK_CHECK_CAST ((o), PAS_BOOK_FACTORY_TYPE, PASBookFactory))
-#define PAS_BOOK_FACTORY_CLASS(k) (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_FACTORY_TYPE, PASBookFactoryClass))
-#define PAS_IS_BOOK_FACTORY(o) (GTK_CHECK_TYPE ((o), PAS_BOOK_FACTORY_TYPE))
-#define PAS_IS_BOOK_FACTORY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_FACTORY_TYPE))
+GType pas_book_factory_get_type (void);
-END_GNOME_DECLS
+G_END_DECLS
#endif /* ! __PAS_BOOK_FACTORY_H__ */