more timezone updates. I'm pretty much done with the calendar code now,

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

	* gui/calendar-model.c:
	* gui/e-calendar-table.c:
	* gui/e-day-view-main-item.c:
	* gui/e-day-view-top-item.c:
	* gui/e-day-view.[hc]:
	* gui/e-week-view.c:
	* gui/gnome-cal.c:
	* gui/print.c:
	* gui/dialogs/cal-prefs-dialog.c:
	* gui/dialogs/comp-editor-util.c:
	* gui/dialogs/event-page.c:
	* pcs/cal-backend-file.c:
	* pcs/query.c:
	* cal-util/cal-component.[hc]:
	* cal-util/cal-recur.c:
	* cal-util/timeutil.[hc]:
	* cal-client/cal-client.[hc]: more timezone updates. I'm pretty much
	done with the calendar code now, except for alarms and conduits,
	which Federico and JP know more about. And there are a couple of
	other minor things to fix. But it is still pretty buggy.

svn path=/trunk/; revision=10984

1 files changed, 2 insertions, 3 deletions

diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index dcad6a44cf..63dd407677 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -29,6 +29,7 @@
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <e-util/e-time-utils.h>
+#include <cal-util/timeutil.h>
 #include "../calendar-config.h"
 #include "comp-editor-util.h"
 
@@ -109,9 +110,7 @@ write_label_piece (struct icaltimetype *tt, char *buffer, int size,
 	tmp_tm.tm_sec = tt->second;
 	tmp_tm.tm_isdst = -1;
 
-	/* Call mktime() to set the weekday. FIXME: Don't do this. mktime()
-	   could in theory adjust the time if it thought it was invalid. */
-	mktime (&tmp_tm);
+	tmp_tm.tm_wday = time_day_of_week (tt->day, tt->month - 1, tt->year);
 
 	len = strlen (buffer);
 	e_time_format_date_and_time (&tmp_tm,