Added the function e_book_view_listener_stop to tell the book view

2001-04-14  Christopher James Lahey  <clahey@ximian.com>

	* backend/ebook/e-book-view-listener.c,
	backend/ebook/e-book-view-listener.h: Added the function
	e_book_view_listener_stop to tell the book view listener to stop
	sending signals.

	* backend/ebook/e-book-view.c (e_book_view_destroy): Tell the
	EBookViewListener to stop when we're destroyed.

	* backend/pas/pas-backend-file.c (view_destroy,
	pas_backend_file_process_get_book_view,
	pas_backend_file_process_get_changes): Cleaned these up a bit
	using bonobo_object_ref and bonobo_object_unref.
	(pas_backend_file_process_get_book_view,
	pas_backend_file_process_get_changes): bonobo_object_release_unref
	the EBookListener here.

	* backend/pas/pas-backend-ldap.c
	(pas_backend_ldap_process_get_book_view): Cleaned this up a bit
	using bonobo_object_ref.  Make sure to unref the listener when
	we're done with it.  Put the new book_view in the list before
	telling the book_listener that it's ready.

	* backend/pas/pas-book-view.c (pas_book_view_construct): Cleaned
	this up a bit using bonobo_object_dup_ref.
	(pas_book_view_destroy): Cleaned this up a bit using
	bonobo_object_release_unref.

	* backend/pas/pas-book.c (pas_book_queue_get_book_view,
	pas_book_queue_get_changes): bonobo_object_dup_ref here instead of
	just duplicating.

svn path=/trunk/; revision=9313

1 files changed, 3 insertions, 20 deletions

diff --git a/addressbook/backend/pas/pas-book-view.c b/addressbook/backend/pas/pas-book-view.c
index db56ae1cff..58f2e79cda 100644
--- a/addressbook/backend/pas/pas-book-view.c
+++ b/addressbook/backend/pas/pas-book-view.c
@@ -185,17 +185,9 @@ pas_book_view_construct (PASBookView                *book_view,
 		return FALSE;
 	}
 
-	CORBA_Object_duplicate (listener, &ev);
+	bonobo_object_dup_ref (listener, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to duplicate listener object in pas-book-view.c\n");
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	GNOME_Evolution_Addressbook_BookViewListener_ref (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to ref listener object in pas-book-view.c\n");
+		g_warning("Unable to duplicate & ref listener object in pas-book-view.c\n");
 		CORBA_exception_free (&ev);
 
 		return FALSE;
@@ -245,21 +237,12 @@ pas_book_view_destroy (GtkObject *object)
 	CORBA_Environment   ev;
 
 	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookViewListener_unref (book_view->priv->listener, &ev);
+	bonobo_object_release_unref (book_view->priv->listener, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		CORBA_exception_free (&ev);
 
 		return;
 	}
-
-	CORBA_Object_release (book_view->priv->listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-
-		return;
-	}
-
 	CORBA_exception_free (&ev);
 
 	g_free (book_view->priv);