mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-22 00:17:32 +09:00
Merge remote-tracking branch 'origin/tracking' into custom
This commit is contained in:
commit
1822f2031e
3280 changed files with 281114 additions and 237673 deletions
|
|
@ -233,6 +233,13 @@ NS_IMETHODIMP nsMessenger::SetWindow(mozIDOMWindowProxy *aWin, nsIMsgWindow *aMs
|
|||
do_GetService(NS_MSGMAILSESSION_CONTRACTID, &rv);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
// Remove the folder listener if we added it, i.e. if mWindow is non-null
|
||||
if (mWindow)
|
||||
{
|
||||
rv = mailSession->RemoveFolderListener(this);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
}
|
||||
|
||||
if (aWin)
|
||||
{
|
||||
mMsgWindow = aMsgWindow;
|
||||
|
|
@ -271,13 +278,6 @@ NS_IMETHODIMP nsMessenger::SetWindow(mozIDOMWindowProxy *aWin, nsIMsgWindow *aMs
|
|||
} // if aWin
|
||||
else
|
||||
{
|
||||
// Remove the folder listener if we added it, i.e. if mWindow is non-null
|
||||
if (mWindow)
|
||||
{
|
||||
rv = mailSession->RemoveFolderListener(this);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
}
|
||||
|
||||
mWindow = nullptr;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue