From 19f12428d3ae6bec7807a793694c49751b0b9b71 Mon Sep 17 00:00:00 2001
From: Edward Lee <edilee@mozilla.com>
Date: Thu, 20 Aug 2009 16:26:22 -0700
Subject: [PATCH] Remove unused cancelRequested code that causes JS strict
 warnings.

---
 services/sync/locales/en-US/status.properties | 2 --
 services/sync/modules/service.js              | 7 +------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/services/sync/locales/en-US/status.properties b/services/sync/locales/en-US/status.properties
index 6a9ee2b82a7..2019a0699c3 100644
--- a/services/sync/locales/en-US/status.properties
+++ b/services/sync/locales/en-US/status.properties
@@ -4,8 +4,6 @@ status.wait = Waiting for Current Sync to Finish
 status.active = Syncing with Weave
 status.success = Sync Complete
 status.error = Sync Failed
-status.cancel = Cancelling Sync, Please Wait
-status.cancelled = Sync Cancelled
 status.closing = Closing...
 
 status.locked = Server Busy
diff --git a/services/sync/modules/service.js b/services/sync/modules/service.js
index 6e4ac16afd9..9e67de0b023 100644
--- a/services/sync/modules/service.js
+++ b/services/sync/modules/service.js
@@ -243,9 +243,6 @@ WeaveSvc.prototype = {
   get isQuitting() { return this._isQuitting; },
   set isQuitting(value) { this._isQuitting = value; },
 
-  get cancelRequested() { return Engines.cancelRequested; },
-  set cancelRequested(value) { Engines.cancelRequested = value; },
-
   get keyGenEnabled() { return this._keyGenEnabled; },
   set keyGenEnabled(value) { this._keyGenEnabled = value; },
 
@@ -1224,7 +1221,6 @@ WeaveSvc.prototype = {
         this._log.info("Sync completed successfully");
       }
     } finally {
-      this.cancelRequested = false;
       this._syncError = false;
     }
   })))(),
@@ -1234,8 +1230,7 @@ WeaveSvc.prototype = {
   _syncEngine: function WeaveSvc__syncEngine(engine) {
     try {
       engine.sync();
-      if (!this.cancelRequested)
-        return true;
+      return true;
     }
     catch(e) {
       // maybe a 401, cluster update needed?