Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

unfork accountUtils.js b=353906 sr=mscott

Browse Source
This commit is contained in:
neil%parkwaycc.co.uk 2006-10-28 22:56:46 +00:00
parent 8162c78baa
commit 9368ec1154
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mailnews/base/prefs/resources/content/accountUtils.js
View File

@ -78,7 +78,6 @@ function getInvalidAccounts(accounts)
return invalidAccounts;
}
#ifndef MOZ_THUNDERBIRD
// This function gets called from verifyAccounts.
// We do not have to do anything on
// unix and mac but on windows we have to bring up a
@ -122,7 +121,6 @@ function showMailIntegrationDialog() {
}
}
}
#endif
function verifyAccounts(wizardcallback)
{
@ -219,11 +217,13 @@ function verifyAccounts(wizardcallback)
}
}
#ifndef MOZ_THUNDERBIRD
// seamonkey still uses this...
// hack, set a time out to do this, so that the window can load first
setTimeout("showMailIntegrationDialog();",0);
#endif
// This will only succeed on SeaMonkey windows builds
var mapiRegistryProgID = "@mozilla.org/mapiregistry;1"
if (mapiRegistryProgID in Components.classes)
{
// hack, set a time out to do this, so that the window can load first
setTimeout(showMailIntegrationDialog, 0);
}
return ret;
}

2
mailnews/jar.mn
View File

@ -82,7 +82,7 @@ messenger.jar:
content/messenger/aw-login.js (base/prefs/resources/content/aw-login.js)
content/messenger/aw-accname.js (base/prefs/resources/content/aw-accname.js)
content/messenger/aw-done.js (base/prefs/resources/content/aw-done.js)
* content/messenger/accountUtils.js (base/prefs/resources/content/accountUtils.js)
content/messenger/accountUtils.js (base/prefs/resources/content/accountUtils.js)
content/messenger/amUtils.js (base/prefs/resources/content/amUtils.js)
content/messenger/ispUtils.js (base/prefs/resources/content/ispUtils.js)
content/messenger/SmtpServerEdit.xul (base/prefs/resources/content/SmtpServerEdit.xul)