subtract 1 from any positive BYSETPOS value, since our array is 0-based.

2001-10-25  Damon Chaplin  <damon@ximian.com>

	* cal-util/cal-recur.c (cal_obj_bysetpos_filter): subtract 1 from
	any positive BYSETPOS value, since our array is 0-based.

	* gui/dialogs/recurrence-page.c (simple_recur_to_comp):
	(recurrence_page_fill_widgets): Outlook (2000) will not accept monthly
	recurrences like BYDAY=2TU. Instead it uses BYDAY=TU;BYSETPOS=2.
	So to be compatable with it we now do the same, although we still
	accept and convert the old format.

	* cal-client/cal-client.c (cal_client_get_component_as_string): new
	function to return a complete VCALENDAR string containing a VEVENT
	or VTODO with all the VTIMEZONEs it uses.

	* gui/dialogs/comp-editor.c (save_as_ok): use above function so we
	save the VTIMEZONE data with the VEVENT/VTODO. Fixes bug #????.
	Also made sure we output "METHOD:PUBLISH" since Outlook (2000) will
	not import it otherwise.

	* gui/dialogs/comp-editor.c (page_mapped_cb):
	(page_unmapped_cb): install/uninstall the GtkAccelGroup for the page.
	(comp_editor_append_page): connect to the map/unmap signals to
	install/uninstall the accelerators. (This is all for bug #11609,
	though of course it doesn't work too well in GTK+ 1.2 anyway.)

	* gui/dialogs/task-page.c (get_widgets):
	* gui/dialogs/task-details-page.c (get_widgets):
	* gui/dialogs/schedule-page.c (get_widgets):
	* gui/dialogs/recurrence-page.c (get_widgets):
	* gui/dialogs/meeting-page.c (get_widgets):
	* gui/dialogs/event-page.c (get_widgets):
	* gui/dialogs/alarm-page.c (get_widgets): got the GtkAccelGroup from
	the original window, ref'ed it and placed it in the CompEditorPage
	struct.

	* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy): unref
	any GtkAccelGroup for the page.

	* gui/dialogs/task-page.glade: changed '_Confidential' to
	'Con_fidential' as it clashed with '_Contacts'. It now matches the
	event editor as well.

	* gui/dialogs/event-page.glade:
	* gui/dialogs/task-page.glade: Set CAN_FOCUS to TRUE for the custom
	EDateEdit widgets, and set them as the accel targets of the labels.

svn path=/trunk/; revision=14108

2 files changed, 76 insertions, 18 deletions

diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
index 79bfae2b1a..1590e0c1e8 100644
--- a/calendar/cal-client/cal-client.c
+++ b/calendar/cal-client/cal-client.c
@@ -1983,6 +1983,8 @@ typedef struct _ForeachTZIDCallbackData ForeachTZIDCallbackData;
 struct _ForeachTZIDCallbackData {
 	CalClient *client;
 	GHashTable *timezone_hash;
+	gboolean include_all_timezones;
+	gboolean success;
 };
 
 /* This adds the VTIMEZONE given by the TZID parameter to the GHashTable in
@@ -2004,19 +2006,29 @@ foreach_tzid_callback (icalparameter *param, void *cbdata)
 	if (!tzid)
 		return;
 
-	/* Check if it is in our cache. If it is, it must already be on the
-	   server so return. */
-	if (g_hash_table_lookup (priv->timezones, tzid))
-		return;
-
 	/* Check if we've already added it to the GHashTable. */
 	if (g_hash_table_lookup (data->timezone_hash, tzid))
 		return;
 
-	/* Check if it is a builtin timezone. If it isn't, return. */
-	zone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
-	if (!zone)
-		return;
+	if (data->include_all_timezones) {
+		CalClientGetStatus status;
+
+		status = cal_client_get_timezone (data->client, tzid, &zone);
+		if (status != CAL_CLIENT_GET_SUCCESS) {
+			data->success = FALSE;
+			return;
+		}
+	} else {
+		/* Check if it is in our cache. If it is, it must already be
+		   on the server so return. */
+		if (g_hash_table_lookup (priv->timezones, tzid))
+			return;
+
+		/* Check if it is a builtin timezone. If it isn't, return. */
+		zone = icaltimezone_get_builtin_timezone_from_tzid (tzid);
+		if (!zone)
+			return;
+	}
 
 	/* Convert it to a string and add it to the hash. */
 	vtimezone_comp = icaltimezone_get_component (zone);
@@ -2040,8 +2052,18 @@ append_timezone_string (gpointer key, gpointer value, gpointer data)
 }
 
 
-/* This converts the VEVENT/VTODO to a string. It checks if we need to send
-   any builtin timezones to the server along with the object.
+/* This simply frees the hash values. */
+static void
+free_timezone_string (gpointer key, gpointer value, gpointer data)
+{
+	g_free (value);
+}
+
+
+/* This converts the VEVENT/VTODO to a string. If include_all_timezones is
+   TRUE, it includes all the VTIMEZONE components needed for the VEVENT/VTODO.
+   If not, it only includes builtin timezones that may not be on the server.
+
    To do that we check every TZID in the component to see if it is a builtin
    timezone. If it is, we see if it it in our cache. If it is in our cache,
    then we know the server already has it and we don't need to send it.
@@ -2050,8 +2072,9 @@ append_timezone_string (gpointer key, gpointer value, gpointer data)
    complete VCALENDAR object, otherwise we can just send a single VEVENT/VTODO
    as before. */
 static char*
-cal_client_get_component_as_string (CalClient *client,
-				    CalComponent *comp)
+cal_client_get_component_as_string_internal (CalClient *client,
+					     CalComponent *comp,
+					     gboolean include_all_timezones)
 {
 	GHashTable *timezone_hash;
 	GString *vcal_string;
@@ -2065,12 +2088,19 @@ cal_client_get_component_as_string (CalClient *client,
 
 	timezone_hash = g_hash_table_new (g_str_hash, g_str_equal);
 
-	/* Add any builtin timezones needed to the hash. We use a hash since
-	   we only want to add each timezone once at most. */
+	/* Add any timezones needed to the hash. We use a hash since we only
+	   want to add each timezone once at most. */
 	cbdata.client = client;
 	cbdata.timezone_hash = timezone_hash;
+	cbdata.include_all_timezones = include_all_timezones;
+	cbdata.success = TRUE;
 	icalcomponent_foreach_tzid (cal_component_get_icalcomponent (comp),
 				    foreach_tzid_callback, &cbdata);
+	if (!cbdata.success) {
+		g_hash_table_foreach (timezone_hash, free_timezone_string,
+				      NULL);
+		return NULL;
+	}
 
 	/* Create the start of a VCALENDAR, to add the VTIMEZONES to,
 	   and remember its length so we know if any VTIMEZONEs get added. */
@@ -2078,7 +2108,8 @@ cal_client_get_component_as_string (CalClient *client,
 	g_string_append (vcal_string,
 			 "BEGIN:VCALENDAR\n"
 			 "PRODID:-//Ximian//NONSGML Evolution Calendar//EN\n"
-			 "VERSION:2.0\n");
+			 "VERSION:2.0\n"
+			 "METHOD:PUBLISH\n");
 	initial_vcal_string_len = vcal_string->len;
 
 	/* Now concatenate all the timezone strings. This also frees the
@@ -2091,7 +2122,8 @@ cal_client_get_component_as_string (CalClient *client,
 
 	/* If there were any timezones to send, create a complete VCALENDAR,
 	   else just send the VEVENT/VTODO string. */
-	if (vcal_string->len == initial_vcal_string_len) {
+	if (!include_all_timezones
+	    && vcal_string->len == initial_vcal_string_len) {
 		g_string_free (vcal_string, TRUE);
 	} else {
 		g_string_append (vcal_string, obj_string);
@@ -2107,6 +2139,26 @@ cal_client_get_component_as_string (CalClient *client,
 }
 
 /**
+ * cal_client_get_component_as_string:
+ * @client: A calendar client.
+ * @comp: A calendar component object.
+ *
+ * Gets a calendar component as an iCalendar string, with a toplevel
+ * VCALENDAR component and all VTIMEZONEs needed for the component.
+ *
+ * Return value: the component as a complete iCalendar string, or NULL on
+ * failure. The string should be freed after use.
+ **/
+char*
+cal_client_get_component_as_string (CalClient *client,
+				    CalComponent *comp)
+{
+	return cal_client_get_component_as_string_internal (client, comp,
+							    TRUE);
+}
+
+
+/**
  * cal_client_update_object:
  * @client: A calendar client.
  * @comp: A calendar component object.
@@ -2138,7 +2190,8 @@ cal_client_update_object (CalClient *client, CalComponent *comp)
 
 	cal_component_commit_sequence (comp);
 
-	obj_string = cal_client_get_component_as_string (client, comp);
+	obj_string = cal_client_get_component_as_string_internal (client,
+								  comp, FALSE);
 	if (obj_string == NULL)
 		return FALSE;
 
diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h
index 36ff410fe1..5ed95b75c3 100644
--- a/calendar/cal-client/cal-client.h
+++ b/calendar/cal-client/cal-client.h
@@ -168,6 +168,11 @@ CalQuery *cal_client_get_query (CalClient *client, const char *sexp);
 /* Resolves TZIDs for the recurrence generator. */
 icaltimezone *cal_client_resolve_tzid_cb (const char *tzid, gpointer data);
 
+/* Returns a complete VCALENDAR for a VEVENT/VTODO including all VTIMEZONEs
+   used by the component. It also includes a 'METHOD:PUBLISH' property. */
+char* cal_client_get_component_as_string (CalClient *client,
+					  CalComponent *comp);
+