Bug 308988 support delegated use of imap shared folders - get address collector working again

p=me r=neil.parkwaycc.co.uk sr=bienvenu


git-svn-id: svn://10.0.0.236/trunk@185718 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bugzilla%arlen.demon.co.uk 2005-12-05 23:28:06 +00:00
parent 6ff929157a
commit 17a4278e0e
2 changed files with 6 additions and 4 deletions

View File

@ -421,7 +421,8 @@ var messageHeaderSink = {
{
try
{
if (!dontCollectAddress && (gCollectIncoming || gCollectNewsgroup || gCollectOutgoing))
var createCard = (gCollectIncoming && !dontCollectAddress) || (gCollectNewsgroup && dontCollectAddress);
if (createCard || gCollectOutgoing)
{
if (!abAddressCollector)
abAddressCollector = Components.classes[abAddressCollectorContractID]
@ -430,7 +431,7 @@ var messageHeaderSink = {
gCollectAddress = header.headerValue;
// collect, add card if doesn't exist and gCollectOutgoing is set,
// otherwise only update existing cards, unknown preferred send format
gCollectAddressTimer = setTimeout('abAddressCollector.collectUnicodeAddress(gCollectAddress, !gCollectOutgoing, Components.interfaces.nsIAbPreferMailFormat.unknown);', 2000);
gCollectAddressTimer = setTimeout('abAddressCollector.collectUnicodeAddress(gCollectAddress, ' + createCard + ', Components.interfaces.nsIAbPreferMailFormat.unknown);', 2000);
}
}
catch(ex) {}

View File

@ -388,7 +388,8 @@ var messageHeaderSink = {
{
try
{
if (!dontCollectAddress && (gCollectIncoming || gCollectNewsgroup || gCollectOutgoing))
var createCard = (gCollectIncoming && !dontCollectAddress) || (gCollectNewsgroup && dontCollectAddress);
if (createCard || gCollectOutgoing)
{
if (!abAddressCollector)
abAddressCollector = Components.classes[abAddressCollectorContractID]
@ -397,7 +398,7 @@ var messageHeaderSink = {
gCollectAddress = header.headerValue;
// collect, add card if doesn't exist and gCollectOutgoing is set,
// otherwise only update existing cards, unknown preferred send format
gCollectAddressTimer = setTimeout('abAddressCollector.collectUnicodeAddress(gCollectAddress, !gCollectOutgoing, Components.interfaces.nsIAbPreferMailFormat.unknown);', 2000);
gCollectAddressTimer = setTimeout('abAddressCollector.collectUnicodeAddress(gCollectAddress, ' + createCard + ', Components.interfaces.nsIAbPreferMailFormat.unknown);', 2000);
}
}
catch(ex) {}