add ability to stop pop3 download, r=putterm an 18060

mailnews/local/public/nsIPop3Service.idl

@@ -27,7 +27,7 @@
 
 interface nsIURI;
 interface nsIStreamListener;
-
+interface nsIMsgWindow;
 
 /*
  * The Pop3 Service is an interface designed to make building and running
@@ -53,7 +53,7 @@ interface nsIPop3Service : nsISupports {
    * mail on different pop3 accounts....
    */
   
-  nsIURI GetNewMail(in nsIUrlListener aUrlListener,
+  nsIURI GetNewMail(in nsIMsgWindow aMsgWindow, in nsIUrlListener aUrlListener,
                     in nsIPop3IncomingServer popServer);
 
   nsIURI CheckForNewMail(in nsIUrlListener aUrlListener,

mailnews/local/src/nsLocalMailFolder.cpp

@@ -1486,7 +1486,7 @@ NS_IMETHODIMP nsMsgLocalMailFolder::GetNewMessages(nsIMsgWindow *aWindow)
 	    rv = server->QueryInterface(nsIPop3IncomingServer::GetIID(),
 					(void **)&popServer);
 	    if (NS_SUCCEEDED(rv)) {
-		rv = pop3Service->GetNewMail(nsnull,popServer,nsnull);
+		rv = pop3Service->GetNewMail(aWindow, nsnull,popServer,nsnull);
 	    }
     }
     else if (PL_strcmp(type, "none") == 0) {

mailnews/local/src/nsPop3Service.cpp

@@ -102,7 +102,7 @@ NS_IMETHODIMP nsPop3Service::CheckForNewMail(nsIUrlListener * aUrlListener,
 }
 
 
-nsresult nsPop3Service::GetNewMail(nsIUrlListener * aUrlListener,
+nsresult nsPop3Service::GetNewMail(nsIMsgWindow *aMsgWindow, nsIUrlListener * aUrlListener,
                                    nsIPop3IncomingServer *popServer,
                                    nsIURI ** aURL)
 {
@@ -127,7 +127,12 @@ nsresult nsPop3Service::GetNewMail(nsIUrlListener * aUrlListener,
 	}
     
 	if (NS_SUCCEEDED(rv) && url) 
+	{
+		nsCOMPtr <nsIMsgMailNewsUrl> mailNewsUrl = do_QueryInterface(url);
+		if (mailNewsUrl)
+			mailNewsUrl->SetMsgWindow(aMsgWindow);
 		rv = RunPopUrl(server, url);
+	}
 
     if (popHost) PL_strfree(popHost);
 

mailnews/local/tests/pop3/pop3Test.cpp

@@ -470,7 +470,7 @@ nsresult nsPop3TestDriver::OnGet()
 
 	if (pop3Service)
 	{
-		pop3Service->GetNewMail(this, popServer, nsnull);
+		pop3Service->GetNewMail(nsnull, this, popServer, nsnull);
 		m_runningURL = PR_TRUE;
 	}
 	return rv;