started some code to show the currently displayed dates in the folder

2001-07-30  Damon Chaplin  <damon@ximian.com>

	* gui/gnome-cal.c:
	* gui/calendar-commands.c (clear_folder_bar_label): started some code
	to show the currently displayed dates in the folder title bar.
	Unfinished.

	* gui/e-itip-control.c (set_date_label):
	* conduits/todo/todo-conduit.c (local_record_from_comp):
	* conduits/calendar/calendar-conduit.c (local_record_from_comp): free
	the CalComponentDateTimes. (Note the iTIP control needs updating for
	timezone support.)

	* cal-util/cal-component.c: Changed CalComponentDateTime so that the
	TZID is malloc'ed and freed rather than being a pointer to a static
	string. This was causing problems as sometimes we were freeing the
	string that was being pointed to, so we got corrupted TZIDs.

	* gui/comp-util.c (cal_comp_util_add_exdate): set TZID to NULL.
	DATE values do not have timezones.

	* gui/e-week-view.c:
	* gui/e-day-view.c: Moved 'Paste' after the New Appointment commands,
	since I think they are more commonly-used. Also added underlined
	accelerator keys.

	* gui/e-calendar-table.c: changed 'Edit this task' to 'Open' in the
	popup menu to be consistent with other folders, and separated from the
	clipboard commands. Also changed to use EPopupMenu so the accelerators
	work, and the masks may be useful at some point.

	* gui/dialogs/recurrence-page.c: use DATE values for UNTIL, since
	that makes it simpler. Fixes bug #5034.

	* gui/calendar-config.c (calendar_config_set_timezone): strdup the
	location string. Fixes bug #4990.

	* gui/tag-calendar.c (tag_calendar_cb): take 1 off iend as the times
	don't include the end time.

	* gui/e-week-view-layout.c (e_week_view_layout_event): fixed
	days_shown. Fixes bug #5709.

	* cal-client/cal-client.c (cal_client_get_timezone): took out some
	debugging messages.

svn path=/trunk/; revision=11494

2 files changed, 13 insertions, 5 deletions

diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c
index 596618733d..b806f8e3e7 100644
--- a/calendar/cal-util/cal-component.c
+++ b/calendar/cal-util/cal-component.c
@@ -1825,9 +1825,9 @@ get_datetime (struct datetime *datetime,
 	/* If the icaltimetype has is_utc set, we set "UTC" as the TZID.
 	   This makes the timezone code simpler. */
 	if (datetime->tzid_param)
-		dt->tzid = icalparameter_get_tzid (datetime->tzid_param);
+		dt->tzid = g_strdup (icalparameter_get_tzid (datetime->tzid_param));
 	else if (dt->value && dt->value->is_utc)
-		dt->tzid = "UTC";
+		dt->tzid = g_strdup ("UTC");
 	else
 		dt->tzid = NULL;
 }
@@ -2254,7 +2254,7 @@ cal_component_get_exdate_list (CalComponent *comp, GSList **exdate_list)
 		*cdt->value = icalproperty_get_exdate (dt->prop);
 
 		if (dt->tzid_param)
-			cdt->tzid = icalparameter_get_tzid (dt->tzid_param);
+			cdt->tzid = g_strdup (icalparameter_get_tzid (dt->tzid_param));
 		else
 			cdt->tzid = NULL;
 
@@ -2290,6 +2290,8 @@ cal_component_set_exdate_list (CalComponent *comp, GSList *exdate_list)
 
 		dt = l->data;
 
+		/* Removing the DATE or DATE-TIME property will also remove
+		   any TZID parameter. */
 		icalcomponent_remove_property (priv->icalcomp, dt->prop);
 		icalproperty_free (dt->prop);
 		g_free (dt);
@@ -3842,8 +3844,8 @@ cal_component_free_datetime (CalComponentDateTime *dt)
 {
 	g_return_if_fail (dt != NULL);
 
-	if (dt->value)
-		g_free (dt->value);
+	g_free (dt->value);
+	g_free ((char*)dt->tzid);
 }
 
 /**
@@ -3866,6 +3868,7 @@ cal_component_free_exdate_list (GSList *exdate_list)
 
 		g_assert (cdt->value != NULL);
 		g_free (cdt->value);
+		g_free ((char*)cdt->tzid);
 
 		g_free (cdt);
 	}
diff --git a/calendar/cal-util/cal-recur.c b/calendar/cal-util/cal-recur.c
index 13c9f0533f..9afcee9784 100644
--- a/calendar/cal-util/cal-recur.c
+++ b/calendar/cal-util/cal-recur.c
@@ -675,6 +675,11 @@ cal_recur_generate_instances_of_rule (CalComponent	 *comp,
 		goto out;
 	}
 
+	/* FIXME: All floating times, including those from recurrence rules,
+	   should be converted to the current timezone, otherwise the time_t
+	   values may be outside the given range. This may also mean that
+	   we need to add a timezone argument to the IDL method. */
+
 	if (dtstart.tzid && tz_cb)
 		start_zone = (*tz_cb) (dtstart.tzid, tz_cb_data);
 	if (dtend.tzid && tz_cb)