3 files changed, 41 insertions, 5 deletions

diff --git a/addressbook/backend/ebook/e-book-view-listener.c b/addressbook/backend/ebook/e-book-view-listener.c
index 8433d1cc29..5f25e7f22a 100644
--- a/addressbook/backend/ebook/e-book-view-listener.c
+++ b/addressbook/backend/ebook/e-book-view-listener.c
@@ -28,6 +28,8 @@ POA_GNOME_Evolution_Addressbook_BookViewListener__vepv  e_book_view_listener_vep
 struct _EBookViewListenerPrivate {
 	GList *response_queue;
 	gint   idle_id;
+
+	guint stopped : 1;
 };
 
 static gboolean
@@ -36,6 +38,11 @@ e_book_view_listener_check_queue (EBookViewListener *listener)
 	static gint thrash = 0;
 	gint queue_len;
 
+	if (listener->priv->stopped) {
+		listener->priv->idle_id = 0;
+		return TRUE;
+	}
+
 	queue_len = g_list_length (listener->priv->response_queue);
 
 	bonobo_object_ref (BONOBO_OBJECT (listener));
@@ -89,6 +96,9 @@ e_book_view_listener_queue_empty_event (EBookViewListener          *listener,
 {
 	EBookViewListenerResponse *resp;
 
+	if (listener->priv->stopped)
+		return;
+
 	resp = g_new0 (EBookViewListenerResponse, 1);
 
 	resp->op        = op;
@@ -107,6 +117,9 @@ e_book_view_listener_queue_id_event (EBookViewListener          *listener,
 {
 	EBookViewListenerResponse *resp;
 
+	if (listener->priv->stopped)
+		return;
+
 	resp = g_new0 (EBookViewListenerResponse, 1);
 
 	resp->op        = op;
@@ -126,6 +139,9 @@ e_book_view_listener_queue_sequence_event (EBookViewListener          *listener,
 	EBookViewListenerResponse *resp;
 	int i;
 
+	if (listener->priv->stopped)
+		return;
+
 	resp = g_new0 (EBookViewListenerResponse, 1);
 
 	resp->op        = op;
@@ -148,6 +164,9 @@ e_book_view_listener_queue_message_event (EBookViewListener          *listener,
 {
 	EBookViewListenerResponse *resp;
 
+	if (listener->priv->stopped)
+		return;
+
 	resp = g_new0 (EBookViewListenerResponse, 1);
 
 	resp->op        = op;
@@ -328,16 +347,21 @@ e_book_view_listener_init (EBookViewListener *listener)
 	listener->priv                 = g_new0 (EBookViewListenerPrivate, 1);
 	listener->priv->response_queue = NULL;
 	listener->priv->idle_id        = 0;
+	listener->priv->stopped        = FALSE;
 }
 
-static void
-e_book_view_listener_destroy (GtkObject *object)
+void
+e_book_view_listener_stop (EBookViewListener *listener)
 {
-	EBookViewListener     *listener = E_BOOK_VIEW_LISTENER (object);
-	GList             *l;
+	GList *l;
 
-	if (listener->priv->idle_id)
+	if (listener->priv->stopped)
+		return;
+
+	if (listener->priv->idle_id) {
 		g_source_remove(listener->priv->idle_id);
+		listener->priv->idle_id = 0;
+	}
 
 	for (l = listener->priv->response_queue; l != NULL; l = l->next) {
 		EBookViewListenerResponse *resp = l->data;
@@ -352,7 +376,17 @@ e_book_view_listener_destroy (GtkObject *object)
 		g_free (resp);
 	}
 	g_list_free (listener->priv->response_queue);
+	listener->priv->response_queue = NULL;
+
+	listener->priv->stopped = TRUE;
+}
+
+static void
+e_book_view_listener_destroy (GtkObject *object)
+{
+	EBookViewListener     *listener = E_BOOK_VIEW_LISTENER (object);
 
+	e_book_view_listener_stop (listener);
 	g_free (listener->priv);
 	
 	GTK_OBJECT_CLASS (e_book_view_listener_parent_class)->destroy (object);
diff --git a/addressbook/backend/ebook/e-book-view-listener.h b/addressbook/backend/ebook/e-book-view-listener.h
index addf91e702..5d85d86c3a 100644
--- a/addressbook/backend/ebook/e-book-view-listener.h
+++ b/addressbook/backend/ebook/e-book-view-listener.h
@@ -63,6 +63,7 @@ EBookViewListener         *e_book_view_listener_new            (void);
 int                        e_book_view_listener_check_pending  (EBookViewListener *listener);
 EBookViewListenerResponse *e_book_view_listener_pop_response   (EBookViewListener *listener);
 GtkType                    e_book_view_listener_get_type       (void);
+void                       e_book_view_listener_stop           (EBookViewListener *listener);
 
 POA_GNOME_Evolution_Addressbook_BookViewListener__epv *e_book_view_listener_get_epv (void);
 
diff --git a/addressbook/backend/ebook/e-book-view.c b/addressbook/backend/ebook/e-book-view.c
index 3528bde63f..f20531a50a 100644
--- a/addressbook/backend/ebook/e-book-view.c
+++ b/addressbook/backend/ebook/e-book-view.c
@@ -208,6 +208,7 @@ e_book_view_destroy (GtkObject *object)
 		if (book_view->priv->responses_queued_id)
 			gtk_signal_disconnect(GTK_OBJECT(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));
 	}