4 files changed, 50 insertions, 0 deletions

diff --git a/calendar/cal-client/cal-listener.c b/calendar/cal-client/cal-listener.c
index 087d5e9c00..0062718155 100644
--- a/calendar/cal-client/cal-listener.c
+++ b/calendar/cal-client/cal-listener.c
@@ -115,6 +115,12 @@ cal_listener_destroy (GtkObject *object)
 	listener = CAL_LISTENER (object);
 	priv = listener->priv;
 
+	priv->cal_opened_fn = NULL;
+	priv->obj_updated_fn = NULL;
+	priv->obj_removed_fn = NULL;
+	priv->categories_changed_fn = NULL;
+	priv->fn_data = NULL;
+
 	CORBA_exception_init (&ev);
 	result = CORBA_Object_is_nil (priv->cal, &ev);
 
diff --git a/calendar/cal-client/cal-query.c b/calendar/cal-client/cal-query.c
index 727a2dcb3b..958bad9f52 100644
--- a/calendar/cal-client/cal-query.c
+++ b/calendar/cal-client/cal-query.c
@@ -181,6 +181,7 @@ cal_query_destroy (GtkObject *object)
 	priv = query->priv;
 
 	/* The server unrefs the query listener, so we just NULL it out here */
+	query_listener_stop_notification (priv->ql);
 	priv->ql = NULL;
 
 	if (priv->corba_query != CORBA_OBJECT_NIL) {
diff --git a/calendar/cal-client/query-listener.c b/calendar/cal-client/query-listener.c
index 980b0a1ece..51563fd9b0 100644
--- a/calendar/cal-client/query-listener.c
+++ b/calendar/cal-client/query-listener.c
@@ -36,6 +36,9 @@ struct _QueryListenerPrivate {
 	QueryListenerQueryDoneFn query_done_fn;
 	QueryListenerEvalErrorFn eval_error_fn;
 	gpointer fn_data;
+
+	/* Whether notification is desired */
+	gboolean notify : 1;
 };
 
 
@@ -105,6 +108,8 @@ query_listener_init (QueryListener *ql)
 	priv->query_done_fn = NULL;
 	priv->eval_error_fn = NULL;
 	priv->fn_data = NULL;
+
+	priv->notify = TRUE;
 }
 
 /* Destroy handler for the live search query listener */
@@ -126,6 +131,8 @@ query_listener_destroy (GtkObject *object)
 	priv->eval_error_fn = NULL;
 	priv->fn_data = NULL;
 
+	priv->notify = FALSE;
+
 	g_free (priv);
 	ql->priv = NULL;
 
@@ -152,6 +159,9 @@ impl_notifyObjUpdated (PortableServer_Servant servant,
 	ql = QUERY_LISTENER (bonobo_object_from_servant (servant));
 	priv = ql->priv;
 
+	if (!priv->notify)
+		return;
+
 	g_assert (priv->obj_updated_fn != NULL);
 	(* priv->obj_updated_fn) (ql, uid, query_in_progress, n_scanned, total, priv->fn_data);
 }
@@ -168,6 +178,9 @@ impl_notifyObjRemoved (PortableServer_Servant servant,
 	ql = QUERY_LISTENER (bonobo_object_from_servant (servant));
 	priv = ql->priv;
 
+	if (!priv->notify)
+		return;
+
 	g_assert (priv->obj_removed_fn != NULL);
 	(* priv->obj_removed_fn) (ql, uid, priv->fn_data);
 }
@@ -185,6 +198,9 @@ impl_notifyQueryDone (PortableServer_Servant servant,
 	ql = QUERY_LISTENER (bonobo_object_from_servant (servant));
 	priv = ql->priv;
 
+	if (!priv->notify)
+		return;
+
 	g_assert (priv->query_done_fn != NULL);
 	(* priv->query_done_fn) (ql, corba_status, error_str, priv->fn_data);
 }
@@ -201,6 +217,9 @@ impl_notifyEvalError (PortableServer_Servant servant,
 	ql = QUERY_LISTENER (bonobo_object_from_servant (servant));
 	priv = ql->priv;
 
+	if (!priv->notify)
+		return;
+
 	g_assert (priv->eval_error_fn != NULL);
 	(* priv->eval_error_fn) (ql, error_str, priv->fn_data);
 }
@@ -279,3 +298,25 @@ query_listener_new (QueryListenerObjUpdatedFn obj_updated_fn,
 					 eval_error_fn,
 					 fn_data);
 }
+
+/**
+ * query_listener_stop_notification:
+ * @ql: A query listener.
+ * 
+ * Informs a query listener that no further notification is desired.  The
+ * callbacks specified when the listener was created will no longer be invoked
+ * after this function is called.
+ **/
+void
+query_listener_stop_notification (QueryListener *ql)
+{
+	QueryListenerPrivate *priv;
+
+	g_return_if_fail (ql != NULL);
+	g_return_if_fail (IS_QUERY_LISTENER (ql));
+
+	priv = ql->priv;
+	g_return_if_fail (priv->notify != FALSE);
+
+	priv->notify = FALSE;
+}
diff --git a/calendar/cal-client/query-listener.h b/calendar/cal-client/query-listener.h
index 53be9f3229..1330216260 100644
--- a/calendar/cal-client/query-listener.h
+++ b/calendar/cal-client/query-listener.h
@@ -89,6 +89,8 @@ QueryListener *query_listener_new (QueryListenerObjUpdatedFn obj_updated_fn,
 				   QueryListenerEvalErrorFn eval_error_fn,
 				   gpointer fn_data);
 
+void query_listener_stop_notification (QueryListener *ql);
+
 
 
 END_GNOME_DECLS