Bug 1492095 - Backed out temporary fix from changeset 96176520c895. a=backout
authorJorg K <jorgk@jorgk.com>
Wed, 26 Sep 2018 10:51:41 +0200
changeset 33234 6dfdc289650b385ba673e5887c29da3d2516f693
parent 33233 3bc0fb310b8a55a282da9addf885f9beba0c8bac
child 33235 8b20130d8bb9b9e2e022644cd48df0eddd1b2cd3
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersbackout
bugs1492095
Bug 1492095 - Backed out temporary fix from changeset 96176520c895. a=backout
calendar/base/src/calAlarmService.js
--- a/calendar/base/src/calAlarmService.js
+++ b/calendar/base/src/calAlarmService.js
@@ -224,22 +224,19 @@ calAlarmService.prototype = {
         }
 
         Services.obs.addObserver(this, "profile-after-change");
         Services.obs.addObserver(this, "xpcom-shutdown");
         Services.obs.addObserver(this, "wake_notification");
 
         /* Tell people that we're alive so they can start monitoring alarms.
          */
-        /*
-         * Temporarily removed, see bug 1492095,
         let notifier = Components.classes["@mozilla.org/embedcomp/appstartup-notifier;1"]
                                  .getService(Components.interfaces.nsIObserver);
         notifier.observe(null, "alarm-service-startup", null);
-         */
 
         cal.getCalendarManager().addObserver(this.calendarManagerObserver);
 
         for (let calendar of cal.getCalendarManager().getCalendars({})) {
             this.observeCalendar(calendar);
         }
 
         /* set up a timer to update alarms every N hours */
@@ -280,22 +277,19 @@ calAlarmService.prototype = {
     },
 
     shutdown: function() {
         if (!this.mStarted) {
             return;
         }
 
         /* tell people that we're no longer running */
-        /*
-         * Temporarily removed, see bug 1492095,
         let notifier = Components.classes["@mozilla.org/embedcomp/appstartup-notifier;1"]
                                  .getService(Components.interfaces.nsIObserver);
         notifier.observe(null, "alarm-service-shutdown", null);
-         */
 
         if (this.mUpdateTimer) {
             this.mUpdateTimer.cancel();
             this.mUpdateTimer = null;
         }
 
         let calmgr = cal.getCalendarManager();
         calmgr.removeObserver(this.calendarManagerObserver);