Fix gdata part of bug 458858 - Lightning keeps asking for password on startup. r=dbo (npotdb)

git-svn-id: svn://10.0.0.236/trunk@255092 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mozilla%kewis.ch 2008-11-18 10:32:41 +00:00
parent ee437152f2
commit 4b3f0887bb

View File

@ -248,6 +248,10 @@ calGoogleSession.prototype = {
ASSERT(!this.mLoggingIn); ASSERT(!this.mLoggingIn);
ASSERT(this.mGoogleUser); ASSERT(this.mGoogleUser);
// Start logging in
this.mLoggingIn = true;
// Check if we have a password. If not, authentication may have // Check if we have a password. If not, authentication may have
// failed. // failed.
if (!this.mGooglePass) { if (!this.mGooglePass) {
@ -327,6 +331,9 @@ calGoogleSession.prototype = {
aCalendar.session = null; aCalendar.session = null;
} }
// We are done logging in
this.mLoggingIn = false;
// The User even canceled the login prompt asking for // The User even canceled the login prompt asking for
// the user. This means we have to fail all requests // the user. This means we have to fail all requests
// that belong to that calendar and are in the queue. This // that belong to that calendar and are in the queue. This
@ -342,9 +349,6 @@ calGoogleSession.prototype = {
// Now we should have a password // Now we should have a password
ASSERT(this.mGooglePass); ASSERT(this.mGooglePass);
// Start logging in
this.mLoggingIn = true;
// Get Version info // Get Version info
var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]. var appInfo = Components.classes["@mozilla.org/xre/app-info;1"].
getService(Components.interfaces.nsIXULAppInfo); getService(Components.interfaces.nsIXULAppInfo);