[Pkg-mozext-commits] [gcontactsync] 21/88: Fixed a bug with the new account wizard, renamed the wizard id

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository gcontactsync.

commit 20b9440046caf94555a2724b92d624951eb04743
Author: Josh Geenen <joshgeenen at gmail.com>
Date:   Sat Jan 4 10:26:48 2014 -0600

    Fixed a bug with the new account wizard, renamed the wizard id
---
 src/content/AccountSetupWizard.js  | 6 ++++--
 src/content/AccountSetupWizard.xul | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/content/AccountSetupWizard.js b/src/content/AccountSetupWizard.js
index 91ab748..ed91f75 100644
--- a/src/content/AccountSetupWizard.js
+++ b/src/content/AccountSetupWizard.js
@@ -170,9 +170,11 @@ com.gContactSync.AccountSetupWizard = {
     var httpReq = new com.gContactSync.GHttpRequest("authenticate", null, null, body);
     // Move to the next page in the wizard upon successful authentication
     httpReq.mOnSuccess = function authSuccess(httpReq) {
+      com.gContactSync.LOGGER.VERBOSE_LOG(httpReq.responseText);
       com.gContactSync.AccountSetupWizard.mAuthToken = httpReq.responseText.split("\n")[2];
-      com.gContactSync.LoginManager.addAuthToken(aUsername, 'GoogleLogin ' + aAuthToken);
-      document.getElementById("initialSetupWizard").advance();
+      com.gContactSync.LoginManager.addAuthToken(com.gContactSync.AccountSetupWizard.mEmailAddress,
+		                                 'GoogleLogin ' + com.gContactSync.AccountSetupWizard.mAuthToken);
+      document.getElementById("newAccountWizard").advance();
     };
     // if it fails, alert the user and prompt them to try again
     httpReq.mOnError = function authError(httpReq) {
diff --git a/src/content/AccountSetupWizard.xul b/src/content/AccountSetupWizard.xul
index 758a9f4..456cb83 100644
--- a/src/content/AccountSetupWizard.xul
+++ b/src/content/AccountSetupWizard.xul
@@ -45,7 +45,7 @@
   %optionsDTD;
 ]>
 
-<wizard id="initialSetupWizard" title="&title.label;"
+<wizard id="newAccountWizard" title="&title.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onwizardfinish="com.gContactSync.AccountSetupWizard.finish();">
   <script type="application/x-javascript"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/gcontactsync.git