From ebeb359291a782052333d599528f9d6b2212f062 Mon Sep 17 00:00:00 2001
From: "jminta%gmail.com" <jminta%gmail.com>
Date: Tue, 1 Aug 2006 03:11:46 +0000
Subject: [PATCH] Bug 307557 Don't guess timezone a second time when opening
 event-dialog, r=dmose

---
 calendar/base/content/calendar-event-dialog.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/calendar/base/content/calendar-event-dialog.js b/calendar/base/content/calendar-event-dialog.js
index f3b7841a3fe..d869b9286ce 100644
--- a/calendar/base/content/calendar-event-dialog.js
+++ b/calendar/base/content/calendar-event-dialog.js
@@ -120,7 +120,7 @@ function onCancel()
 
 function loadDialog(item)
 {
-    var kDefaultTimezone = calendarDefaultTimezone();
+    var kDefaultTimezone = window.opener.calendarDefaultTimezone();
 
     setElementValue("item-title",       item.title);
     setElementValue("item-location",    item.getProperty("LOCATION"));
@@ -264,7 +264,7 @@ function saveDialog(item)
     setItemProperty(item, "title",       getElementValue("item-title"));
     setItemProperty(item, "LOCATION",    getElementValue("item-location"));
 
-    var kDefaultTimezone = calendarDefaultTimezone();
+    var kDefaultTimezone = window.opener.calendarDefaultTimezone();
 
     if (isEvent(item)) {
         var startDate = jsDateToDateTime(getElementValue("event-starttime"));
@@ -456,7 +456,7 @@ function onStartTimeChange()
     }
     var start = jsDateToDateTime(getElementValue(startWidgetId));
     start.addDuration(gItemDuration);
-    setElementValue(endWidgetId, start.getInTimezone(calendarDefaultTimezone()).jsDate);
+    setElementValue(endWidgetId, start.getInTimezone(window.opener.calendarDefaultTimezone()).jsDate);
     updateAccept();
 }
 
@@ -485,7 +485,7 @@ function updateAccept()
 {
     var enableAccept = true;
 
-    var kDefaultTimezone = calendarDefaultTimezone();
+    var kDefaultTimezone = window.opener.calendarDefaultTimezone();
 
     var title = getElementValue("item-title");
     if (title.length == 0)
@@ -704,7 +704,7 @@ function editRecurrence()
     args.calendarEvent = window.calendarItem;
     args.recurrenceInfo = window.recurrenceInfo || args.calendarEvent.recurrenceInfo;
 
-    var kDefaultTimezone = calendarDefaultTimezone();
+    var kDefaultTimezone = window.opener.calendarDefaultTimezone();
     if (isEvent(window.calendarItem)) {
         var startDate = jsDateToDateTime(getElementValue("event-starttime")).getInTimezone(kDefaultTimezone);
         if (getElementValue("event-all-day", "checked")) {