use g_type_class_peek_parent.

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

	* backend/pas/pas-backend-card-sexp.c
	(pas_backend_card_sexp_class_init): use g_type_class_peek_parent.

	* backend/pas/pas-card-cursor.c (pas_card_cursor_class_init): same.

	* backend/pas/pas-book-view.c (pas_book_view_class_init): same.

	* backend/pas/pas-book-factory.c (pas_book_factory_class_init): same.

	* backend/pas/pas-backend-summary.c (pas_backend_summary_class_init): same.

	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_class_init): same.

	* backend/pas/pas-backend-file.c (pas_backend_file_class_init): same.

	* backend/ebook/e-book-marshal.list: ENUM -> INT.

	* backend/ebook/e-book-view.c (e_book_view_dispose): guard against
	this being called multiple times.
	(e_book_view_class_init): ENUM -> INT in the sequence_complete
	signal.

	* backend/ebook/e-book.c (e_book_do_response_open): un-ifdef the
	component_died signal stuff.

svn path=/trunk/; revision=18623

11 files changed, 58 insertions, 30 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 9760972fad..1c16566a3a 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,32 @@
 2002-11-06  Chris Toshok  <toshok@ximian.com>
 
+	* backend/pas/pas-backend-card-sexp.c
+	(pas_backend_card_sexp_class_init): use g_type_class_peek_parent.
+
+	* backend/pas/pas-card-cursor.c (pas_card_cursor_class_init): same.
+
+	* backend/pas/pas-book-view.c (pas_book_view_class_init): same.
+
+	* backend/pas/pas-book-factory.c (pas_book_factory_class_init): same.
+
+	* backend/pas/pas-backend-summary.c (pas_backend_summary_class_init): same.
+
+	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_class_init): same.
+
+	* backend/pas/pas-backend-file.c (pas_backend_file_class_init): same.
+
+	* backend/ebook/e-book-marshal.list: ENUM -> INT.
+
+	* backend/ebook/e-book-view.c (e_book_view_dispose): guard against
+	this being called multiple times.
+	(e_book_view_class_init): ENUM -> INT in the sequence_complete
+	signal.
+	
+	* backend/ebook/e-book.c (e_book_do_response_open): un-ifdef the
+	component_died signal stuff.
+
+2002-11-06  Chris Toshok  <toshok@ximian.com>
+
 	* backend/ebook/e-book-util.c (e_book_expand_uri): call
 	g_build_filename, not g_build_path.
 
diff --git a/addressbook/backend/ebook/e-book-marshal.list b/addressbook/backend/ebook/e-book-marshal.list
index 3624766421..680ea039a3 100644
--- a/addressbook/backend/ebook/e-book-marshal.list
+++ b/addressbook/backend/ebook/e-book-marshal.list
@@ -2,4 +2,4 @@ NONE:NONE
 NONE:BOOL
 NONE:POINTER
 NONE:STRING
-NONE:ENUM
+NONE:INT
diff --git a/addressbook/backend/ebook/e-book-view.c b/addressbook/backend/ebook/e-book-view.c
index 47f8575b8f..68c73e06f7 100644
--- a/addressbook/backend/ebook/e-book-view.c
+++ b/addressbook/backend/ebook/e-book-view.c
@@ -231,32 +231,35 @@ e_book_view_dispose (GObject *object)
 	EBookView             *book_view = E_BOOK_VIEW (object);
 	CORBA_Environment  ev;
 
-	if (book_view->priv->book) {
-		g_object_unref (book_view->priv->book);
-	}
+	if (book_view->priv) {
+		if (book_view->priv->book) {
+			g_object_unref (book_view->priv->book);
+		}
 
-	if (book_view->priv->corba_book_view) {
-		CORBA_exception_init (&ev);
+		if (book_view->priv->corba_book_view) {
+			CORBA_exception_init (&ev);
 
-		bonobo_object_release_unref (book_view->priv->corba_book_view, &ev);
+			bonobo_object_release_unref (book_view->priv->corba_book_view, &ev);
 
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("EBookView: Exception while releasing BookView\n");
+			if (ev._major != CORBA_NO_EXCEPTION) {
+				g_warning ("EBookView: Exception while releasing BookView\n");
+			}
+
+			CORBA_exception_free (&ev);
 		}
 
-		CORBA_exception_free (&ev);
-	}
+		if (book_view->priv->listener) {
+			if (book_view->priv->responses_queued_id)
+				g_signal_handler_disconnect(book_view->priv->listener,
+							    book_view->priv->responses_queued_id);
+			e_book_view_listener_stop (book_view->priv->listener);
+			bonobo_object_unref (BONOBO_OBJECT(book_view->priv->listener));
+		}
 
-	if (book_view->priv->listener) {
-		if (book_view->priv->responses_queued_id)
-			g_signal_handler_disconnect(book_view->priv->listener,
-						    book_view->priv->responses_queued_id);
-		e_book_view_listener_stop (book_view->priv->listener);
-		bonobo_object_unref (BONOBO_OBJECT(book_view->priv->listener));
+		g_free (book_view->priv);
+		book_view->priv = NULL;
 	}
 
-	g_free (book_view->priv);
-
 	G_OBJECT_CLASS(parent_class)->dispose (object);
 }
 
@@ -303,9 +306,9 @@ e_book_view_class_init (EBookViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (EBookViewClass, sequence_complete),
 			      NULL, NULL,
-			      e_book_marshal_NONE__ENUM,
+			      e_book_marshal_NONE__INT,
 			      G_TYPE_NONE, 1,
-			      G_TYPE_ENUM);
+			      G_TYPE_INT);
 
 	e_book_view_signals [STATUS_MESSAGE] =
 		g_signal_new ("status_message",
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index fe8f90cee7..40938b1e8f 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -421,11 +421,9 @@ e_book_do_response_open (EBook                 *book,
 		book->priv->corba_book  = resp->book;
 		book->priv->load_state  = URILoaded;
 
-#if PENDING_PORT_WORK
 		book->priv->comp_listener = e_component_listener_new (book->priv->corba_book, 0);
                 book->priv->died_signal = g_signal_connect (book->priv->comp_listener, "component_died",
 							    G_CALLBACK (backend_died_cb), book);
-#endif
 	}
 
 	op = e_book_pop_op (book);
diff --git a/addressbook/backend/pas/pas-backend-card-sexp.c b/addressbook/backend/pas/pas-backend-card-sexp.c
index f33c391534..f79046def1 100644
--- a/addressbook/backend/pas/pas-backend-card-sexp.c
+++ b/addressbook/backend/pas/pas-backend-card-sexp.c
@@ -422,7 +422,7 @@ pas_backend_card_sexp_class_init (PASBackendCardSExpClass *klass)
 {
 	GObjectClass  *object_class = G_OBJECT_CLASS (klass);
 
-	parent_class = g_type_class_ref (G_TYPE_OBJECT);
+	parent_class = g_type_class_peek_parent (klass);
 
 	/* Set the virtual methods. */
 
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index 0c09f5e325..0b61ccd16f 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -1644,7 +1644,7 @@ pas_backend_file_class_init (PASBackendFileClass *klass)
 	GObjectClass    *object_class = G_OBJECT_CLASS (klass);
 	PASBackendClass *parent_class;
 
-	pas_backend_file_parent_class = g_type_class_ref (PAS_TYPE_BACKEND);
+	pas_backend_file_parent_class = g_type_class_peek_parent (klass);
 
 	parent_class = PAS_BACKEND_CLASS (klass);
 
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index 4b180632b4..cf464ba4e6 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -3463,7 +3463,7 @@ pas_backend_ldap_class_init (PASBackendLDAPClass *klass)
 	/* get client side information (extensions present in the library) */
 	get_ldap_library_info ();
 
-	pas_backend_ldap_parent_class = g_type_class_ref (PAS_TYPE_BACKEND);
+	pas_backend_ldap_parent_class = g_type_class_peek_parent (klass);
 
 	parent_class = PAS_BACKEND_CLASS (klass);
 
diff --git a/addressbook/backend/pas/pas-backend-summary.c b/addressbook/backend/pas/pas-backend-summary.c
index 9161ef7ffb..a8683912f9 100644
--- a/addressbook/backend/pas/pas-backend-summary.c
+++ b/addressbook/backend/pas/pas-backend-summary.c
@@ -177,7 +177,7 @@ pas_backend_summary_class_init (PASBackendSummaryClass *klass)
 {
 	GObjectClass  *object_class = G_OBJECT_CLASS (klass);
 
-	parent_class = g_type_class_ref (G_TYPE_OBJECT);
+	parent_class = g_type_class_peek_parent (klass);
 
 	/* Set the virtual methods. */
 
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c
index dd80c470db..5ca1af6acc 100644
--- a/addressbook/backend/pas/pas-book-factory.c
+++ b/addressbook/backend/pas/pas-book-factory.c
@@ -562,7 +562,7 @@ pas_book_factory_class_init (PASBookFactoryClass *klass)
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	POA_GNOME_Evolution_Addressbook_BookFactory__epv *epv;
 
-	pas_book_factory_parent_class = g_type_class_ref (BONOBO_TYPE_OBJECT);
+	pas_book_factory_parent_class = g_type_class_peek_parent (klass);
 
 	object_class->dispose = pas_book_factory_dispose;
 
diff --git a/addressbook/backend/pas/pas-book-view.c b/addressbook/backend/pas/pas-book-view.c
index 392291726f..722732beb9 100644
--- a/addressbook/backend/pas/pas-book-view.c
+++ b/addressbook/backend/pas/pas-book-view.c
@@ -228,7 +228,7 @@ pas_book_view_class_init (PASBookViewClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	pas_book_view_parent_class = g_object_new (BONOBO_TYPE_OBJECT, NULL);
+	pas_book_view_parent_class = g_type_class_peek_parent (klass);
 
 	object_class->dispose = pas_book_view_dispose;
 }
diff --git a/addressbook/backend/pas/pas-card-cursor.c b/addressbook/backend/pas/pas-card-cursor.c
index c9e6df4e80..52d8911271 100644
--- a/addressbook/backend/pas/pas-card-cursor.c
+++ b/addressbook/backend/pas/pas-card-cursor.c
@@ -74,7 +74,7 @@ pas_card_cursor_class_init (PASCardCursorClass *klass)
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	POA_GNOME_Evolution_Addressbook_CardCursor__epv *epv;
 
-	parent_class = g_type_class_ref (BONOBO_TYPE_OBJECT);
+	parent_class = g_type_class_peek_parent (klass);
 
 	object_class->dispose = pas_card_cursor_dispose;