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

4 files changed, 25 insertions, 5 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 595499a84f..b2ac5bb2a8 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,24 @@
+2003-01-09  Dan Winship  <danw@ximian.com>
+
+	* gui/dialogs/recurrence-page.c (make_recur_month_num_submenu,
+	make_recur_month_num_menu, month_num_menu_selection_done_cb): Use
+	the new cal_recur_nth[] array. The way this was done before didn't
+	localize properly.
+
+	* cal-util/cal-recur.c (cal_recur_nth): array of localized month
+	day names ("1st" - "31st")
+
+	* 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.
+
 2003-01-08  Ettore Perazzoli  <ettore@ximian.com>
 
 	* gui/alarm-notify/Makefile.am: Icons are now in
diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c
index 50c2ad95d8..a5300a9605 100644
--- a/calendar/cal-util/cal-component.c
+++ b/calendar/cal-util/cal-component.c
@@ -3238,7 +3238,7 @@ cal_component_set_recurid (CalComponent *comp, CalComponentRange *recur_id)
 	set_datetime (comp, &priv->recur_id.recur_time,
 		      icalproperty_new_recurrenceid,
 		      icalproperty_set_recurrenceid,
-		      &recur_id->datetime);
+		      recur_id ? &recur_id->datetime : NULL);
 }
 
 /**
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 564de4a6ed..64873bce2e 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -38,7 +38,6 @@
 #include <libgnomeprint/gnome-print-master.h>
 #include <libgnomeprintui/gnome-print-master-preview.h>
 #include <libgnomeprintui/gnome-print-paper-selector.h>
-#include <libgnomeprintui/gnome-print-copies.h>
 #include <libgnomeprintui/gnome-print-preview.h>
 #include <libgnomeprintui/gnome-printer-dialog.h>
 #include <e-util/e-dialog-widgets.h>
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);