From 5231945dc5c03c6690f7dd49cd1819f8597b4297 Mon Sep 17 00:00:00 2001 From: "bienvenu%nventure.com" Date: Tue, 28 Nov 2006 18:02:18 +0000 Subject: [PATCH] fix 359882 autoconfig checking for e-mail identity doesn't work if default account has multiple identities, sr=mscott git-svn-id: svn://10.0.0.236/trunk@215983 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/pref/autoconfig/src/nsAutoConfig.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mozilla/extensions/pref/autoconfig/src/nsAutoConfig.cpp b/mozilla/extensions/pref/autoconfig/src/nsAutoConfig.cpp index 6a27cbd0204..2f68482d033 100644 --- a/mozilla/extensions/pref/autoconfig/src/nsAutoConfig.cpp +++ b/mozilla/extensions/pref/autoconfig/src/nsAutoConfig.cpp @@ -526,6 +526,9 @@ nsresult nsAutoConfig::getEmailAddr(nsACString & emailAddr) getter_Copies(prefValue)); if (NS_FAILED(rv) || prefValue.IsEmpty()) return PromptForEMailAddress(emailAddr); + PRInt32 commandIndex = prefValue.FindChar(','); + if (commandIndex != kNotFound) + prefValue.Truncate(commandIndex); emailAddr = NS_LITERAL_CSTRING("mail.identity.") + prefValue + NS_LITERAL_CSTRING(".useremail"); rv = mPrefBranch->GetCharPref(PromiseFlatCString(emailAddr).get(),