# HG changeset patch
# User Geoff Lankow <geoff@darktrojan.net>
# Date 1534928321 -43200
# Node ID b94f1e4b62e6effb2d18941caf6787394ca29cba
# Parent  3275d30455dd4558839617fa0fe1f226645f3bdf
Bug 1008735 - When changing timezones, wait until timezone service is ready before updating views. r=philipp

diff --git a/calendar/base/content/calendar-base-view.xml b/calendar/base/content/calendar-base-view.xml
--- a/calendar/base/content/calendar-base-view.xml
+++ b/calendar/base/content/calendar-base-view.xml
@@ -247,16 +247,17 @@
           alarmService.addObserver(this.mObserver);
           this.setAttribute("type", this.type);
           this.mResizeHandler = () => {
               this.onResize(this);
           };
           this.viewBroadcaster.addEventListener(this.getAttribute("type") + "viewresized", this.mResizeHandler, true);
           // add a preference observer to monitor changes
           Services.prefs.addObserver("calendar.", this.mPrefObserver);
+          Services.obs.addObserver(this.mTimezoneObserver, "defaultTimezoneChanged");
           this.weekStartOffset = Preferences.get("calendar.week.start", 0);
           this.updateDaysOffPrefs();
           this.mPendingRefreshJobs = new Map();
           this.mLog = Log4Moz.getConfiguredLogger("calBaseView");
           this.mFlashingEvents = {};
       ]]></constructor>
 
       <destructor><![CDATA[
@@ -265,16 +266,17 @@
           if (this.mCalendar) {
               this.mCalendar.removeObserver(this.mObserver);
           }
           let alarmService = Components.classes["@mozilla.org/calendar/alarm-service;1"]
                                        .getService(Components.interfaces.calIAlarmService);
           alarmService.removeObserver(this.mObserver);
           this.viewBroadcaster.removeEventListener(this.getAttribute("type") + "viewresized", this.mResizeHandler, true);
           Services.prefs.removeObserver("calendar.", this.mPrefObserver);
+          Services.obs.removeObserver(this.mTimezoneObserver, "defaultTimezoneChanged");
       ]]></destructor>
 
       <property name="type" readonly="true">
         <getter><![CDATA[
             let typelist = this.id.split("-");
             return typelist[0];
         ]]></getter>
       </property>
@@ -627,20 +629,16 @@
                 case "calendar.week.d1mondaysoff":
                 case "calendar.week.d2tuesdaysoff":
                 case "calendar.week.d3wednesdaysoff":
                 case "calendar.week.d4thursdaysoff":
                 case "calendar.week.d5fridaysoff":
                 case "calendar.week.d6saturdaysoff":
                     this.updateDaysOffPrefs();
                     break;
-                case "calendar.timezone.local":
-                    this.timezone = cal.dtz.defaultTimezone;
-                    this.refreshView();
-                    break;
                 case "calendar.alarms.indicator.show":
                     // Break here to ensure the view is refreshed
                     break;
                 case "calendar.week.start":
                     this.weekStartOffset = aSubject.getIntPref(aPreference);
                     break;
                 case "calendar.date.format":
                 case "calendar.view.showLocation":
diff --git a/calendar/base/content/calendar-month-view.xml b/calendar/base/content/calendar-month-view.xml
--- a/calendar/base/content/calendar-month-view.xml
+++ b/calendar/base/content/calendar-month-view.xml
@@ -82,23 +82,25 @@
             this.mOccurrence = val;
             if (cal.item.isEvent(val)) {
                 if (!val.startDate.isDate) {
                     let label = document.getAnonymousElementByAttribute(this, "anonid", "item-label");
                     let formatter = Components.classes["@mozilla.org/calendar/datetime-formatter;1"]
                                               .getService(Components.interfaces.calIDateTimeFormatter);
                     let timezone = this.calendarView ? this.calendarView.mTimezone
                                                      : cal.dtz.defaultTimezone;
-                    let parentDate = cal.dtz.ensureDateTime(this.parentBox.date);
+                    let parentDate = this.parentBox.date;
+                    let parentTime = cal.createDateTime();
+                    parentTime.resetTo(parentDate.year, parentDate.month, parentDate.day, 0, 0, 0, timezone);
                     let startTime = val.startDate.getInTimezone(timezone);
                     let endTime = val.endDate.getInTimezone(timezone);
-                    let nextDay = parentDate.clone();
+                    let nextDay = parentTime.clone();
                     nextDay.day++;
                     let comp = endTime.compare(nextDay);
-                    if (startTime.compare(parentDate) == -1) {
+                    if (startTime.compare(parentTime) == -1) {
                         if (comp == 1) {
                             label.value = "↔";
                         } else if (comp == 0) {
                             label.value = "↤";
                         } else {
                             label.value = "⇥ " + formatter.formatTime(endTime);
                         }
                     } else if (comp == 1) {
@@ -441,16 +443,25 @@
       <field name="mSelectedDayBox">null</field>
 
       <field name="mShowDaysOutsideMonth">true</field>
       <field name="mShowFullMonth">true</field>
       <field name="mShowWeekNumber">true</field>
 
       <field name="mClickedTime">null</field>
 
+      <field name="mTimezoneObserver"><![CDATA[
+        ({
+            observe: () => {
+                this.timezone = cal.dtz.defaultTimezone;
+                this.refreshView();
+            }
+        })
+      ]]></field>
+
       <!-- other methods -->
       <method name="setAttribute">
         <parameter name="aAttr"/>
         <parameter name="aVal"/>
         <body><![CDATA[
             let needsrelayout = (aAttr == "context" || aAttr == "item-context");
             let ret = XULElement.prototype.setAttribute.call(this, aAttr, aVal);
 
diff --git a/calendar/base/content/calendar-multiday-view.xml b/calendar/base/content/calendar-multiday-view.xml
--- a/calendar/base/content/calendar-multiday-view.xml
+++ b/calendar/base/content/calendar-multiday-view.xml
@@ -2738,16 +2738,26 @@
       <field name="mDayStartMin">0</field>
       <field name="mDayEndMin">0</field>
       <field name="mVisibleMinutes">9 * 60</field>
       <field name="mClickedTime">null</field>
       <field name="mTimeIndicatorInterval">15</field>
       <field name="mModeHandler">null</field>
       <field name="mTimeIndicatorMinutes">0</field>
 
+      <field name="mTimezoneObserver"><![CDATA[
+        ({
+            observe: () => {
+                this.timezone = cal.dtz.defaultTimezone;
+                this.refreshView();
+                this.updateTimeIndicatorPosition(true);
+            }
+        })
+      ]]></field>
+
       <method name="flashAlarm">
         <parameter name="aAlarmItem"/>
         <parameter name="aStop"/>
         <body><![CDATA[
             // Helper function to save some duplicate code
             function setFlashingAttribute(aBox) {
                 if (aStop) {
                     aBox.removeAttribute("flashing");
diff --git a/calendar/base/content/calendar-unifinder.js b/calendar/base/content/calendar-unifinder.js
--- a/calendar/base/content/calendar-unifinder.js
+++ b/calendar/base/content/calendar-unifinder.js
@@ -22,17 +22,16 @@ ChromeUtils.import("resource://gre/modul
 
 // Set this to true when the calendar event tree is clicked to allow for
 // multiple selection
 var gCalendarEventTreeClicked = false;
 
 // Store the start and enddate, because the providers can't be trusted when
 // dealing with all-day events. So we need to filter later. See bug 306157
 
-var kDefaultTimezone;
 var gUnifinderNeedsRefresh = true;
 
 /**
  * Checks if the unifinder is hidden
  *
  * @return      Returns true if the unifinder is hidden.
  */
 function isUnifinderHidden() {
@@ -164,47 +163,40 @@ var unifinderObserver = {
             items = aItem.getOccurrencesBetween(filter.startDate, filter.endDate, {});
         } else {
             items = [aItem];
         }
         // XXX: do we really still need this, we are always checking it in the refreshInternal
         unifinderTreeView.removeItems(items.filter(filter.isItemInFilters, filter));
     },
 
-    observe: function(aSubject, aTopic, aPrefName) {
-        switch (aPrefName) {
-            case "calendar.date.format":
-            case "calendar.timezone.local":
-                refreshEventTree();
-                break;
-        }
+    observe: function() {
+        refreshEventTree();
     }
 };
 
 /**
  * Called when the window is loaded to prepare the unifinder. This function is
  * used to add observers, event listeners, etc.
  */
 function prepareCalendarUnifinder() {
     // Only load once
     window.removeEventListener("load", prepareCalendarUnifinder);
     let unifinderTree = document.getElementById("unifinder-search-results-tree");
 
     // Add pref observer
-    let branch = Services.prefs.getBranch("");
-    branch.addObserver("calendar.", unifinderObserver);
+    Services.prefs.addObserver("calendar.date.format", unifinderObserver);
+    Services.obs.addObserver(unifinderObserver, "defaultTimezoneChanged");
 
     // Check if this is not the hidden window, which has no UI elements
     if (unifinderTree) {
         // set up our calendar event observer
         let ccalendar = cal.view.getCompositeCalendar(window);
         ccalendar.addObserver(unifinderObserver);
 
-        kDefaultTimezone = cal.dtz.defaultTimezone;
-
         // Set up the filter
         unifinderTreeView.mFilter = new calFilter();
 
         // Set up the unifinder views.
         unifinderTreeView.treeElement = unifinderTree;
         unifinderTree.view = unifinderTreeView;
 
         // Listen for changes in the selected day, so we can update if need be
@@ -243,18 +235,18 @@ function prepareCalendarUnifinder() {
  * Called when the window is unloaded to clean up any observers and listeners
  * added.
  */
 function finishCalendarUnifinder() {
     let ccalendar = cal.view.getCompositeCalendar(window);
     ccalendar.removeObserver(unifinderObserver);
 
     // Remove pref observer
-    let branch = Services.prefs.getBranch("");
-    branch.removeObserver("calendar.", unifinderObserver);
+    Services.prefs.removeObserver("calendar.date.format", unifinderObserver);
+    Services.obs.removeObserver(unifinderObserver, "defaultTimezoneChanged");
 
     let viewDeck = getViewDeck();
     if (viewDeck) {
         viewDeck.removeEventListener("dayselect", unifinderDaySelect);
         viewDeck.removeEventListener("itemselect", unifinderItemSelect, true);
     }
 
     // Persist the sort
@@ -288,17 +280,17 @@ function unifinderItemSelect(aEvent) {
 
 /**
  * Helper function to display event datetimes in the unifinder.
  *
  * @param aDatetime     A calIDateTime object to format.
  * @return              The passed date's formatted in the default timezone.
  */
 function formatUnifinderEventDateTime(aDatetime) {
-    return cal.getDateFormatter().formatDateTime(aDatetime.getInTimezone(kDefaultTimezone));
+    return cal.getDateFormatter().formatDateTime(aDatetime.getInTimezone(cal.dtz.defaultTimezone));
 }
 
 /**
  * Handler function for double clicking the unifinder.
  *
  * @param event         The DOM doubleclick event.
  */
 function unifinderDoubleClick(event) {
diff --git a/calendar/base/content/calendar-views.js b/calendar/base/content/calendar-views.js
--- a/calendar/base/content/calendar-views.js
+++ b/calendar/base/content/calendar-views.js
@@ -722,8 +722,19 @@ var timeIndicator = {
     cancel: function() {
         if (timeIndicator.timer) {
             clearTimeout(timeIndicator.timer);
             timeIndicator.timer = null;
         }
     },
     lastView: null
 };
+
+var timezoneObserver = {
+    observe: function() {
+        let minimonth = getMinimonth();
+        minimonth.update(minimonth.value);
+    }
+};
+Services.obs.addObserver(timezoneObserver, "defaultTimezoneChanged");
+window.addEventListener("unload", () => {
+    Services.obs.removeObserver(timezoneObserver, "defaultTimezoneChanged");
+});
diff --git a/calendar/base/content/today-pane.js b/calendar/base/content/today-pane.js
--- a/calendar/base/content/today-pane.js
+++ b/calendar/base/content/today-pane.js
@@ -37,24 +37,34 @@ var TodayPane = {
 
         document.getElementById("modeBroadcaster").addEventListener("DOMAttrModified", TodayPane.onModeModified);
         TodayPane.setTodayHeader();
 
         document.getElementById("today-splitter").addEventListener("command", onCalendarViewResize);
         TodayPane.updateSplitterState();
         TodayPane.previousMode = document.getElementById("modeBroadcaster").getAttribute("mode");
         TodayPane.showTodayPaneStatusLabel();
+
+        Services.obs.addObserver(TodayPane, "defaultTimezoneChanged");
     },
 
     /**
      * Unload handler, cleans up the today pane on window unload.
      */
     onUnload: function() {
         document.getElementById("modeBroadcaster").removeEventListener("DOMAttrModified", TodayPane.onModeModified);
         document.getElementById("today-splitter").removeEventListener("command", onCalendarViewResize);
+        Services.obs.removeObserver(TodayPane, "defaultTimezoneChanged");
+    },
+
+    /**
+     * React if the default timezone changes.
+     */
+    observe: function() {
+        this.setDay(cal.dtz.now());
     },
 
     /**
      * Sets up the label for the switcher that allows switching between today pane
      * views. (event+task, task only, event only)
      */
     setTodayHeader: function() {
         let currentMode = document.getElementById("modeBroadcaster").getAttribute("mode");
diff --git a/calendar/base/content/widgets/minimonth.xml b/calendar/base/content/widgets/minimonth.xml
--- a/calendar/base/content/widgets/minimonth.xml
+++ b/calendar/base/content/widgets/minimonth.xml
@@ -932,16 +932,18 @@
 
                     if (aDate.getMonth() == date.getMonth() &&
                         aDate.getFullYear() == date.getFullYear()) {
                         day.setAttribute("aria-label", date.toLocaleDateString(undefined, { day: "numeric" }));
                     } else {
                         day.setAttribute("aria-label", dateFormatter.format(date));
                     }
 
+                    day.removeAttribute("busy");
+
                     day.date = new Date(date);
                     day.textContent = date.getDate();
                     date.setDate(date.getDate() + 1);
 
                     if (monthChanged) {
                         this.resetAttributesForDate(day.date);
                     }
                 }
diff --git a/calendar/base/src/calTimezoneService.js b/calendar/base/src/calTimezoneService.js
--- a/calendar/base/src/calTimezoneService.js
+++ b/calendar/base/src/calTimezoneService.js
@@ -275,16 +275,17 @@ calTimezoneService.prototype = {
         }
     },
 
     observe: function(aSubject, aTopic, aData) {
         if (aTopic == "nsPref:changed" && aData == "calendar.timezone.local") {
             // Unsetting the default timezone will make the next call to the
             // default timezone getter set up the correct timezone again.
             this.mDefaultTimezone = null;
+            Services.obs.notifyObservers(null, "defaultTimezoneChanged");
         }
     }
 };
 
 /**
  * We're going to do everything in our power, short of rumaging through the
  * user's actual file-system, to figure out the time-zone they're in.  The
  * deciding factors are the offsets given by (northern-hemisphere) summer and