Allow recur_id to be NULL to clear the recurrence id. (Based on a story by

	* cal-util/cal-component.c (cal_component_set_recurid): Allow
	recur_id to be NULL to clear the recurrence id. (Based on a story
	by JP on evolution-1-2-recurid-branch)

	* gui/print.c: Remove unused gnome-print-copies.h #include

	* pcs/query.c (query_new): Use g_object_weak_ref rather than
	connecting to "destroy" (which doesn't actually exist on a
	CalBackend)
	(backend_destroyed_cb): Update prototype.

svn path=/trunk/; revision=19365

1 files changed, 3 insertions, 3 deletions

diff --git a/calendar/pcs/query.c b/calendar/pcs/query.c
index 4e077245ce..4bcfaf1ce5 100644
--- a/calendar/pcs/query.c
+++ b/calendar/pcs/query.c
@@ -1584,7 +1584,7 @@ backend_opened_cb (CalBackend *backend, CalBackendOpenStatus status, gpointer da
 
 /* Callback used when the backend for a cached query is destroyed */
 static void
-backend_destroyed_cb (GObject *object, gpointer data)
+backend_destroyed_cb (gpointer data, GObject *where_backend_was)
 {
 	Query *query;
 
@@ -1723,8 +1723,8 @@ query_new (CalBackend *backend,
 	}
 
 	/* add the new query to our cache */
-	g_signal_connect (G_OBJECT (query->priv->backend), "destroy",
-			  G_CALLBACK (backend_destroyed_cb), query);
+	g_object_weak_ref (G_OBJECT (query->priv->backend),
+			   backend_destroyed_cb, query);
 
 	bonobo_object_ref (BONOBO_OBJECT (query));
 	cached_queries = g_list_append (cached_queries, query);