From 7ec882a27209d0f75a0eb1c0b2661e908a4d4b97 Mon Sep 17 00:00:00 2001
From: "sfraser%netscape.com" <sfraser%netscape.com>
Date: Sat, 19 Jun 1999 22:04:20 +0000
Subject: [PATCH] Leak fixing. CreateNewTopLevel window returns an AddReffed
 window. You must release it. Also comment out the extra release, with comment
 about why.

---
 mailnews/base/src/nsMessenger.cpp            | 17 ++++++++++-------
 mailnews/compose/src/nsMsgComposeService.cpp | 14 +++++++++++++-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/mailnews/base/src/nsMessenger.cpp b/mailnews/base/src/nsMessenger.cpp
index 1f28ff99b92b..34d60825a459 100644
--- a/mailnews/base/src/nsMessenger.cpp
+++ b/mailnews/base/src/nsMessenger.cpp
@@ -260,6 +260,8 @@ nsMessenger::Open3PaneWindow()
 	char *  urlstr=nsnull;
 	nsresult rv = NS_OK;
 	
+	nsCOMPtr<nsIWebShellWindow> newWindow;
+
 	urlstr = "resource:/res/samples/messenger.html";
 	NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv);
   
@@ -268,17 +270,15 @@ nsMessenger::Open3PaneWindow()
 	if (NS_SUCCEEDED(rv) && pNetService) {
 		rv = pNetService->CreateURL(&url, urlstr);
 		if (NS_FAILED(rv))
-			goto done;
+			goto done;		// goto in C++ is evil!
 	}
 	else
-		goto done;
+		goto done;		// goto in C++ is evil!
 
-
-	nsIWebShellWindow* newWindow;
 	appShell->CreateTopLevelWindow(nsnull,      // parent
                                    url,
                                    PR_TRUE,
-                                   newWindow,   // result widget
+                                   *getter_AddRefs(newWindow),   // result widget
                                    nsnull,      // observer
                                    nsnull,      // callbacks
                                    200,         // width
@@ -678,7 +678,10 @@ nsMessenger::OnUnload()
     // which causes us to have one more ref count. Call Release() here
     // seems the right thing to do. This gurantees the nsMessenger instance
     // gets deleted after we close down the messenger window.
-    Release();
+    
+    // smfr the one extra refcount is the result of a bug 8555, which I have 
+    // checked in a fix for. So I'm commenting out this extra release.
+    //Release();
     return NS_OK;
 }
 
@@ -865,7 +868,7 @@ nsMessenger::GetTransactionManager(nsITransactionManager* *aTxnMgr)
   return NS_OK;
 }
 
-nsresult 
+static nsresult 
 SendUnsentMessagesCallback(nsresult aExitCode, PRUint32 totalSentCount,
                            PRUint32 totalSentSuccessfully, void *tagData)
 {
diff --git a/mailnews/compose/src/nsMsgComposeService.cpp b/mailnews/compose/src/nsMsgComposeService.cpp
index 1aa590de42cb..f670e4b68cc4 100644
--- a/mailnews/compose/src/nsMsgComposeService.cpp
+++ b/mailnews/compose/src/nsMsgComposeService.cpp
@@ -154,7 +154,19 @@ nsresult nsMsgComposeService::DisposeCompose(nsIMsgCompose *compose, PRBool clos
 		
 		if (closeWindow)
 			;//TODO
-		NS_RELEASE(compose);
+
+
+		// comment copied from nsMessenger.cpp. It's the same issue.
+    // ** clean up
+    // *** jt - We seem to have one extra ref count. I have no idea where it
+    // came from. This could be the global object we created in commandglue.js
+    // which causes us to have one more ref count. Call Release() here
+    // seems the right thing to do. This gurantees the nsMessenger instance
+    // gets deleted after we close down the messenger window.
+    
+    // smfr the one extra refcount is the result of a bug 8555, which I have 
+    // checked in a fix for. So I'm commenting out this extra release.
+		//NS_RELEASE(compose);
 	}
 	return NS_OK;
 }