set op->listener to NULL to catch possible use of freed op

2001-08-05  Radek Doulik  <rodo@ximian.com>

	* backend/ebook/e-book.c (e_book_do_response_get_view): set
	op->listener to NULL to catch possible use of freed op
	(e_book_do_response_get_changes): ditto

	* backend/ebook/e-book-view-listener.c
	   (e_book_view_listener_check_queue): this callback could be (and
	   indeed is) called from signal emited above,
	   signal handler could call e_book_view_listener_stop, so we need
to check
	   if idle is still set and if not we don't want to unref again

svn path=/trunk/; revision=11692

1 files changed, 4 insertions, 1 deletions

diff --git a/addressbook/backend/ebook/e-book-view-listener.c b/addressbook/backend/ebook/e-book-view-listener.c
index 7e0f6d5c29..761cf12281 100644
--- a/addressbook/backend/ebook/e-book-view-listener.c
+++ b/addressbook/backend/ebook/e-book-view-listener.c
@@ -47,7 +47,10 @@ e_book_view_listener_check_queue (EBookViewListener *listener)
 				 e_book_view_listener_signals [RESPONSES_QUEUED]);
 	}
 
-	if (listener->priv->response_queue == NULL) {
+	/* this callback could be (and indeed is) called from signal emited above,
+	   signal handler could call e_book_view_listener_stop, so we need to check
+	   if idle is still set and if not we don't want to unref again */
+	if (listener->priv->response_queue == NULL && listener->priv->idle_id != 0) {
 		listener->priv->idle_id = 0;
 		bonobo_object_unref (BONOBO_OBJECT (listener));
 		return FALSE;