mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 05:15:45 +00:00
Fix for smoketest blocker 134280. We need to set the identity to the default one if it's null. SR=sspitzer, A= granrose
This commit is contained in:
parent
4223c7b432
commit
815e67cee9
@ -375,9 +375,13 @@ nsMsgComposeService::DetermineComposeHTML(nsIMsgIdentity *aIdentity, MSG_Compose
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsMsgComposeService::OpenComposeWindow(const char *msgComposeWindowURL, const char *originalMsgURI,
|
||||
MSG_ComposeType type, MSG_ComposeFormat format, nsIMsgIdentity * identity, nsIMsgWindow *aMsgWindow)
|
||||
MSG_ComposeType type, MSG_ComposeFormat format, nsIMsgIdentity * aIdentity, nsIMsgWindow *aMsgWindow)
|
||||
{
|
||||
nsresult rv;
|
||||
|
||||
nsCOMPtr<nsIMsgIdentity> identity = aIdentity;
|
||||
if (!identity)
|
||||
GetDefaultIdentity(getter_AddRefs(identity));
|
||||
|
||||
/* Actually, the only way to implement forward inline is to simulate a template message.
|
||||
Maybe one day when we will have more time we can change that
|
||||
@ -442,7 +446,8 @@ nsMsgComposeService::OpenComposeWindow(const char *msgComposeWindowURL, const ch
|
||||
PRBool requestForReturnReceipt = PR_FALSE;
|
||||
PRBool useCustomPrefs = PR_FALSE;
|
||||
PRInt32 receiptType = nsIMsgMdnGenerator::eDntType;
|
||||
identity->GetBoolAttribute("use_custom_prefs", &useCustomPrefs);
|
||||
if (identity)
|
||||
identity->GetBoolAttribute("use_custom_prefs", &useCustomPrefs);
|
||||
if (useCustomPrefs)
|
||||
{
|
||||
identity->GetBoolAttribute("request_return_receipt_on",
|
||||
|
Loading…
Reference in New Issue
Block a user