зеркало из https://github.com/mozilla/gecko-dev.git
Bug 312474 IMAP/RSS message headers not shown if there is no POP-mail account set up
p=me r=mscott sr=bienvenu
This commit is contained in:
Родитель
9ab613d889
Коммит
2faecee410
|
@ -419,27 +419,27 @@ var messageHeaderSink = {
|
||||||
if (msgHeaderParser && header.headerValue)
|
if (msgHeaderParser && header.headerValue)
|
||||||
fromMailbox = msgHeaderParser.extractHeaderAddressMailboxes(null, header.headerValue);
|
fromMailbox = msgHeaderParser.extractHeaderAddressMailboxes(null, header.headerValue);
|
||||||
|
|
||||||
if (header.headerValue) {
|
if (header.headerValue)
|
||||||
if ((gCollectIncoming && !dontCollectAddress) ||
|
{
|
||||||
(gCollectNewsgroup && dontCollectAddress))
|
try
|
||||||
{
|
{
|
||||||
if (!abAddressCollector)
|
if (!dontCollectAddress && (gCollectIncoming || gCollectNewsgroup || gCollectOutgoing))
|
||||||
abAddressCollector = Components.classes[abAddressCollectorContractID].getService(Components.interfaces.nsIAbAddressCollecter);
|
{
|
||||||
|
if (!abAddressCollector)
|
||||||
|
abAddressCollector = Components.classes[abAddressCollectorContractID]
|
||||||
|
.getService(Components.interfaces.nsIAbAddressCollecter);
|
||||||
|
|
||||||
gCollectAddress = header.headerValue;
|
gCollectAddress = header.headerValue;
|
||||||
// collect, and add card if doesn't exist, unknown preferred send format
|
if (gCollectOutgoing)
|
||||||
gCollectAddressTimer = setTimeout('abAddressCollector.collectUnicodeAddress(gCollectAddress, true, Components.interfaces.nsIAbPreferMailFormat.unknown);', 2000);
|
// collect, but only update existing cards, unknown preferred send format
|
||||||
|
gCollectAddressTimer = setTimeout('abAddressCollector.collectUnicodeAddress(gCollectAddress, false, Components.interfaces.nsIAbPreferMailFormat.unknown);', 2000);
|
||||||
|
else
|
||||||
|
// collect, and add card if doesn't exist, unknown preferred send format
|
||||||
|
gCollectAddressTimer = setTimeout('abAddressCollector.collectUnicodeAddress(gCollectAddress, true, Components.interfaces.nsIAbPreferMailFormat.unknown);', 2000);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (gCollectOutgoing)
|
catch(ex) {}
|
||||||
{
|
}
|
||||||
if (!abAddressCollector)
|
|
||||||
abAddressCollector = Components.classes[abAddressCollectorContractID].getService(Components.interfaces.nsIAbAddressCollecter);
|
|
||||||
|
|
||||||
// collect, but only update existing cards, unknown preferred send format
|
|
||||||
gCollectAddress = header.headerValue;
|
|
||||||
gCollectAddressTimer = setTimeout('abAddressCollector.collectUnicodeAddress(gCollectAddress, false, Components.interfaces.nsIAbPreferMailFormat.unknown);', 2000);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} // if lowerCaseHeaderName == "from"
|
} // if lowerCaseHeaderName == "from"
|
||||||
} // while we have more headers to parse
|
} // while we have more headers to parse
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче