зеркало из https://github.com/mozilla/pjs.git
fix for #75290. clean up our temp files when doing save as draft.
fix by cavin@netscape.com. r=ducarroz, sr=sspitzer
This commit is contained in:
Родитель
f310bb045a
Коммит
0485197843
|
@ -59,9 +59,6 @@ interface nsIMsgComposeService : nsISupports {
|
|||
/* ... */
|
||||
nsIMsgCompose InitCompose(in nsIDOMWindowInternal aWindow, in nsIMsgComposeParams params);
|
||||
|
||||
/* ... */
|
||||
void DisposeCompose(in nsIMsgCompose compose);
|
||||
|
||||
/* This function is use for debugging purpose only and may go away at anytime without warning */
|
||||
void TimeStamp(in string label, in boolean resetTime);
|
||||
};
|
||||
|
|
|
@ -516,8 +516,10 @@ function UpdateOfflineState()
|
|||
|
||||
function DoCommandClose()
|
||||
{
|
||||
if (ComposeCanClose())
|
||||
CloseWindow()
|
||||
var retVal;
|
||||
if ((retVal = ComposeCanClose()))
|
||||
MsgComposeCloseWindow();
|
||||
return retVal;
|
||||
}
|
||||
|
||||
function DoCommandPrint()
|
||||
|
@ -866,13 +868,10 @@ function ComposeLoad()
|
|||
msgComposeService.TimeStamp("Done with the initialization (ComposeLoad). Waiting on editor to load about::blank", false);
|
||||
}
|
||||
|
||||
function ComposeUnload(calledFromExit)
|
||||
function ComposeUnload()
|
||||
{
|
||||
dump("\nComposeUnload from XUL\n");
|
||||
|
||||
msgCompose.UnregisterStateListener(stateListener);
|
||||
if (msgCompose && msgComposeService)
|
||||
msgComposeService.DisposeCompose(msgCompose, false);
|
||||
}
|
||||
|
||||
function SetDocumentCharacterSet(aCharset)
|
||||
|
@ -1450,7 +1449,7 @@ function ComposeCanClose()
|
|||
return true;
|
||||
}
|
||||
|
||||
function CloseWindow()
|
||||
function MsgComposeCloseWindow()
|
||||
{
|
||||
if (msgCompose)
|
||||
msgCompose.CloseWindow();
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
xmlns:nc="http://home.netscape.com/NC-rdf#"
|
||||
onunload="ComposeUnload()"
|
||||
onload="ComposeLoad()"
|
||||
onclose="return ComposeCanClose()"
|
||||
onclose="return DoCommandClose()"
|
||||
onfocus="UpdateOfflineState()"
|
||||
title="&msgComposeWindow.title;"
|
||||
windowtype="msgcompose"
|
||||
|
|
|
@ -564,7 +564,7 @@ nsresult nsMsgCompose::_SendMsg(MSG_DeliverMode deliverMode, nsIMsgIdentity *ide
|
|||
// set this object for use on completion...
|
||||
sendListener->SetComposeObj(this);
|
||||
sendListener->SetDeliverMode(deliverMode);
|
||||
PRUint32 listeners;
|
||||
PRUint32 listeners = 0;
|
||||
nsIMsgSendListener **tArray = sendListener->CreateListenerArray(&listeners);
|
||||
if (!tArray)
|
||||
{
|
||||
|
|
|
@ -339,12 +339,6 @@ nsresult nsMsgComposeService::InitCompose(nsIDOMWindowInternal *aWindow,
|
|||
return rv;
|
||||
}
|
||||
|
||||
|
||||
nsresult nsMsgComposeService::DisposeCompose(nsIMsgCompose *compose)
|
||||
{
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsMsgComposeService::TimeStamp(const char * label, PRBool resetTime)
|
||||
{
|
||||
#ifdef MSGCOMP_TRACE_PERFORMANCE
|
||||
|
|
Загрузка…
Ссылка в новой задаче