don't call bonobo_activation_init directly.

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

	* backend/ebook/test-client-list.c (main): don't call
	bonobo_activation_init directly.

	* backend/ebook/test-client.c (get_card_cb): don't unref the card
	here since we never reffed it.
	(main): no need to call bonobo_activation_init, as
	gnome_program_init did it for us.

	* backend/ebook/e-card-simple.c (e_card_simple_get_property):
	s/g_value_{set,get}_pointer/g_value_{set,get}_object

	* backend/ebook/e-book-util.c (set_default_book_uri_local): make
	sure to terminate args with NULL for g_build_filename.

	* backend/ebook/e-book-listener.c: nuke e_book_listener_get_type
	and use the BONOBO_TYPE_FUNC_FULL macro.

	* backend/ebook/e-book-listener.h: add the epv to
	EBookListenerClass so BONOBO_TYPE_FUNC_FULL works.

	* backend/ebook/e-book-view-listener.c: nuke
	e_book_view_listener_get_type and use the BONOBO_TYPE_FUNC_FULL
	macro.

	* backend/ebook/e-book-view-listener.h: add the epv to
	EBookViewListenerClass so BONOBO_TYPE_FUNC_FULL works.

svn path=/trunk/; revision=18543

1 files changed, 8 insertions, 29 deletions

diff --git a/addressbook/backend/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c
index ed3fad586a..df27e3092a 100644
--- a/addressbook/backend/ebook/e-book-listener.c
+++ b/addressbook/backend/ebook/e-book-listener.c
@@ -783,7 +783,7 @@ e_book_listener_dispose (GObject *object)
 }
 
 static void
-corba_class_init (void)
+corba_class_init (EBookListenerClass *klass)
 {
 	POA_GNOME_Evolution_Addressbook_BookListener__vepv *vepv;
 	POA_GNOME_Evolution_Addressbook_BookListener__epv *epv;
@@ -795,7 +795,7 @@ corba_class_init (void)
 	base_epv->default_POA = NULL;
 
 
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookListener__epv, 1);
+	epv = &klass->epv;
 
 	epv->notifyOpenBookProgress     = impl_BookListener_report_open_book_progress;
 	epv->notifyBookOpened           = impl_BookListener_respond_open_book;
@@ -834,32 +834,11 @@ e_book_listener_class_init (EBookListenerClass *klass)
 
 	object_class->dispose = e_book_listener_dispose;
 
-	corba_class_init ();
+	corba_class_init (klass);
 }
 
-/**
- * e_book_listener_get_type:
- */
-GType
-e_book_listener_get_type (void)
-{
-	static GType type = 0;
-
-	if (! type) {
-		GTypeInfo info = {
-			sizeof (EBookListenerClass),
-			NULL, /* base_class_init */
-			NULL, /* base_class_finalize */
-			(GClassInitFunc)  e_book_listener_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof (EBookListener),
-			0,    /* n_preallocs */
-			(GInstanceInitFunc) e_book_listener_init
-		};
-
-		type = g_type_register_static (G_TYPE_OBJECT, "EBookListener", &info, 0);
-	}
-
-	return type;
-}
+BONOBO_TYPE_FUNC_FULL (
+		       EBookListener,
+		       GNOME_Evolution_Addressbook_BookListener,
+		       BONOBO_TYPE_OBJECT,
+		       e_book_listener);