Bug 656349 - Sync Setup error dialog appears when bypassing easy setup [r=mfinkle]
authorMatt Brubeck <mbrubeck@mozilla.com>
Sat, 14 May 2011 14:11:44 -0700
changeset 69528 5b483355806f4943a8fc5b76693f3f9f3a73da85
parent 69527 a625e03f9490f2c18036c9a00735eafd8cdb6c0b
child 69529 17bad70688714ba65942eaa2c52552bea3c45ccb
push id20002
push usermbrubeck@mozilla.com
push dateSat, 14 May 2011 21:36:22 +0000
treeherdermozilla-central@992f91cd375d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs656349
milestone6.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 656349 - Sync Setup error dialog appears when bypassing easy setup [r=mfinkle]
mobile/chrome/content/sync.js
--- a/mobile/chrome/content/sync.js
+++ b/mobile/chrome/content/sync.js
@@ -127,18 +127,17 @@ let WeaveGlue = {
         self.close();
         self.setupData = aCredentials;
         self.connect();
       },
 
       onAbort: function onAbort(aError) {
         self.jpake = null;
 
-        // No error means manual abort. Ignore.
-        if (!aError || container.hidden)
+        if (aError == "jpake.error.userabort" || container.hidden)
           return;
 
         // Automatically go to manual setup if we couldn't acquire a channel.
         let brandShortName = Strings.brand.GetStringFromName("brandShortName");
         let tryAgain = self._bundle.GetStringFromName("sync.setup.tryagain");
         let manualSetup = self._bundle.GetStringFromName("sync.setup.manual");
         let buttonFlags = Ci.nsIPrompt.BUTTON_POS_1_DEFAULT +
                          (Ci.nsIPrompt.BUTTON_TITLE_IS_STRING * Ci.nsIPrompt.BUTTON_POS_0) +