Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 288212 cleanup nsAutoConfig::getEmailAddr and nsReadConfig::readConfigFile

Browse Source 
r=alecf sr=alecf a=shaver


git-svn-id: svn://10.0.0.236/trunk@173929 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org
2005-06-01 16:25:13 +00:00
parent 22257176fd
commit 2bba0ae021
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/extensions/pref/autoconfig/src/nsAutoConfig.cpp
View File

@@ -536,30 +536,28 @@ nsresult nsAutoConfig::getEmailAddr(nsACString & emailAddr)
rv = mPrefBranch->GetCharPref("mail.accountmanager.defaultaccount",
getter_Copies(prefValue));
// Checking prefValue and its length. Since by default the preference
// is set to nothing
PRUint32 len;
if (NS_SUCCEEDED(rv) && (len = strlen(prefValue)) > 0) {
emailAddr = NS_LITERAL_CSTRING("mail.account.") +
nsDependentCString(prefValue, len) + NS_LITERAL_CSTRING(".identities");
if (NS_SUCCEEDED(rv) && !prefValue.IsEmpty()) {
emailAddr = NS_LITERAL_CSTRING("mail.account.") +
prefValue + NS_LITERAL_CSTRING(".identities");
rv = mPrefBranch->GetCharPref(PromiseFlatCString(emailAddr).get(),
getter_Copies(prefValue));
if (NS_FAILED(rv) || (len = strlen(prefValue)) == 0)
if (NS_FAILED(rv) || prefValue.IsEmpty())
return PromptForEMailAddress(emailAddr);
emailAddr = NS_LITERAL_CSTRING("mail.identity.") +
nsDependentCString(prefValue, len) + NS_LITERAL_CSTRING(".useremail");
emailAddr = NS_LITERAL_CSTRING("mail.identity.") +
prefValue + NS_LITERAL_CSTRING(".useremail");
rv = mPrefBranch->GetCharPref(PromiseFlatCString(emailAddr).get(),
getter_Copies(prefValue));
if (NS_FAILED(rv) || (len = strlen(prefValue)) == 0)
if (NS_FAILED(rv) || prefValue.IsEmpty())
return PromptForEMailAddress(emailAddr);
emailAddr = nsDependentCString(prefValue, len);
emailAddr = prefValue;
}
else {
// look for 4.x pref in case we just migrated.
rv = mPrefBranch->GetCharPref("mail.identity.useremail",
getter_Copies(prefValue));
if (NS_SUCCEEDED(rv) && !prefValue.IsEmpty())
emailAddr = prefValue;
emailAddr = prefValue;
else if (NS_FAILED(PromptForEMailAddress(emailAddr)) && (!mCurrProfile.IsEmpty()))
emailAddr = mCurrProfile;
}

4
mozilla/extensions/pref/autoconfig/src/nsReadConfig.cpp
View File

@@ -246,8 +246,8 @@ nsresult nsReadConfig::readConfigFile()
nsXPIDLCString urlName;
rv = prefBranch->GetCharPref("autoadmin.global_config_url",
getter_Copies(urlName));
if (NS_SUCCEEDED(rv) && *urlName != '\0' ) {
if (NS_SUCCEEDED(rv) && !urlName.IsEmpty()) {
// Instantiating nsAutoConfig object if the pref is present
mAutoConfig = do_CreateInstance(NS_AUTOCONFIG_CONTRACTID, &rv);
if (NS_FAILED(rv))