one more time; try to fix Sun build bustage

mailnews/imap/src/nsImapUndoTxn.cpp

@@ -133,10 +133,6 @@ nsImapMoveCopyMsgTxn::QueryInterface(REFNSIID aIID, void** aInstancePtr)
     {
         *aInstancePtr = NS_STATIC_CAST(nsImapMoveCopyMsgTxn*, this);
     }
-    else if (aIID.Equals(nsIUrlListener::GetIID()))
-    {
-        *aInstancePtr = NS_STATIC_CAST(nsIUrlListener*, this);
-    }
 
     if (*aInstancePtr)
     {
@@ -379,15 +375,3 @@ nsImapMoveCopyMsgTxn::RedoMailboxDelete()
 }
 
 
-NS_IMETHODIMP
-nsImapMoveCopyMsgTxn::OnStartRunningUrl(nsIURI* aUrl)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsImapMoveCopyMsgTxn::OnStopRunningUrl(nsIURI* aUrl, nsresult exitCode)
-{
-    return NS_OK;
-}
-

mailnews/imap/src/nsImapUndoTxn.h

@@ -33,7 +33,7 @@
 	0x51c925b0, 0x208e, 0x11d3, \
     { 0xab, 0xea, 0x00, 0x80, 0x5f, 0x8a, 0xc9, 0x68 } }
 
-class nsImapMoveCopyMsgTxn : public nsMsgTxn, public nsIUrlListener
+class nsImapMoveCopyMsgTxn : public nsMsgTxn
 {
 public:
     NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMAPMOVECOPYMSGTXN_IID)
@@ -53,10 +53,6 @@ public:
     NS_IMETHOD GetUndoString(nsString *aString);
     NS_IMETHOD GetRedoString(nsString *aString);
 
-    // nsIUrlListener methods
-	NS_IMETHOD OnStartRunningUrl(nsIURI * aUrl);
-	NS_IMETHOD OnStopRunningUrl(nsIURI * aUrl, nsresult aExitCode);
-    
     // helper
     nsresult SetUndoString(nsString *aString);
     nsresult SetRedoString(nsString *aString);

mailnews/local/src/nsLocalUndoTxn.cpp

@@ -59,10 +59,6 @@ nsLocalMoveCopyMsgTxn::QueryInterface(REFNSIID aIID, void** aInstancePtr)
     {
         *aInstancePtr = NS_STATIC_CAST(nsLocalMoveCopyMsgTxn*, this);
     }
-    else if (aIID.Equals(nsIUrlListener::GetIID()))
-    {
-        *aInstancePtr = NS_STATIC_CAST(nsIUrlListener*, this);
-    }
 
     if (*aInstancePtr)
     {
@@ -181,9 +177,7 @@ nsLocalMoveCopyMsgTxn::UndoImapDeleteFlag(nsIMsgFolder* folder,
             nsString2 msgIds("", eOneByte);
             PRUint32 i, count = keyArray.GetSize();
 
-            rv  = QueryInterface(nsIUrlListener::GetIID(),
-                                 getter_AddRefs(urlListener));
-            if (NS_FAILED(rv)) return rv;
+            urlListener = do_QueryInterface(folder, &rv);
 
             for (i=0; i < count; i++)
             {
@@ -215,7 +209,7 @@ nsLocalMoveCopyMsgTxn::UndoImapDeleteFlag(nsIMsgFolder* folder,
                                                          PR_TRUE);
                     if (NS_SUCCEEDED(rv))
                         imapService->SelectFolder(eventQueue, folder,
-                                                  this, nsnull);
+                                                  urlListener, nsnull);
                 }
             }
         }
@@ -335,16 +329,3 @@ nsLocalMoveCopyMsgTxn::Redo()
 
     return rv;
 }
-
-NS_IMETHODIMP
-nsLocalMoveCopyMsgTxn::OnStartRunningUrl(nsIURI* aUrl)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLocalMoveCopyMsgTxn::OnStopRunningUrl(nsIURI* aUrl, nsresult exitCode)
-{
-    return NS_OK;
-}
-

mailnews/local/src/nsLocalUndoTxn.h

@@ -32,7 +32,7 @@
 	0x874363b4, 0x242e, 0x11d3, \
 	{ 0xaf, 0xad, 0x00, 0x10, 0x83, 0x00, 0x2d, 0xa8 } }
 
-class nsLocalMoveCopyMsgTxn : public nsMsgTxn, public nsIUrlListener
+class nsLocalMoveCopyMsgTxn : public nsMsgTxn
 {
 public:
     NS_DEFINE_STATIC_IID_ACCESSOR(NS_LOCALMOVECOPYMSGTXN_IID)
@@ -45,10 +45,6 @@ public:
 
     NS_DECL_ISUPPORTS_INHERITED
 
-    // nsIUrlListener methods
-	NS_IMETHOD OnStartRunningUrl(nsIURI * aUrl);
-	NS_IMETHOD OnStopRunningUrl(nsIURI * aUrl, nsresult aExitCode);
-
     // overloading nsITransaction methods
 	NS_IMETHOD Undo(void);
     NS_IMETHOD Redo(void);