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

Fix for bug 99217. Need to save the identity key when saving a draft/template. Patch submitted by Frank Schšnheit<frank.schoenheit@gmx.de>. R=ducarroz, SR=bienvenu

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@133043 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ducarroz%netscape.com 2002-11-06 00:21:15 +00:00
parent 8672bbe6a9
commit 6eceaa4adf
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/mailnews/compose/src/nsMsgSend.cpp
View File

@ -4326,7 +4326,12 @@ nsMsgComposeAndSend::MimeDoFCC(nsFileSpec *input_file,
// Ok, now I want to get the identity key and write it out if this is for a
// nsMsgQueueForLater operation!
//
if ( (mode == nsMsgQueueForLater) && (mUserIdentity) )
if ( ( ( nsMsgQueueForLater == mode )
|| ( nsMsgSaveAsDraft == mode )
|| ( nsMsgSaveAsTemplate == mode )
)
&& ( mUserIdentity )
)
{
char *key = nsnull;

21
mozilla/mailnews/mime/src/mimedrft.cpp
View File

@ -63,6 +63,8 @@
#include "nsIMIMEService.h"
#include "nsIMIMEInfo.h"
#include "nsIMsgHeaderParser.h"
#include "nsIMsgAccountManager.h"
#include "nsMsgBaseCID.h"
//
// Header strings...
@ -1252,6 +1254,7 @@ mime_parse_stream_complete (nsMIMESession *stream)
char *foll = 0;
char *priority = 0;
char *draftInfo = 0;
char *identityKey = 0;
PRBool xlate_p = PR_FALSE; /* #### how do we determine this? */
PRBool sign_p = PR_FALSE; /* #### how do we determine this? */
@ -1415,6 +1418,23 @@ mime_parse_stream_complete (nsMIMESession *stream)
}
// identity to prefer when opening the message in the compose window?
identityKey = MimeHeaders_get(mdd->headers, HEADER_X_MOZILLA_IDENTITY_KEY, PR_FALSE, PR_FALSE);
if ( identityKey && *identityKey )
{
nsresult rv = NS_OK;
nsCOMPtr< nsIMsgAccountManager > accountManager =
do_GetService( NS_MSGACCOUNTMANAGER_CONTRACTID, &rv );
if ( NS_SUCCEEDED(rv) && accountManager )
{
nsCOMPtr< nsIMsgIdentity > overrulingIdentity;
rv = accountManager->GetIdentity( identityKey, getter_AddRefs( overrulingIdentity ) );
if ( NS_SUCCEEDED(rv) && overrulingIdentity )
mdd->identity = overrulingIdentity;
}
}
if (mdd->messageBody)
{
MSG_ComposeFormat composeFormat = nsIMsgCompFormat::Default;
@ -1657,6 +1677,7 @@ mime_parse_stream_complete (nsMIMESession *stream)
PR_FREEIF(foll);
PR_FREEIF(priority);
PR_FREEIF(draftInfo);
PR_Free(identityKey);
mime_free_attach_data(newAttachData);
}