bug 106479:Multiple IMAP accounts: Check "Empty Trash on Exit" from account setting freeze an IMAP account without Trash folder. r=timeless sr=mscott

Check in Henry Jia's(henry.jia@sun.com) fix


git-svn-id: svn://10.0.0.236/trunk@119215 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/mailnews/imap/src/nsImapMailFolder.cpp

@@ -1228,8 +1228,11 @@ NS_IMETHODIMP nsImapMailFolder::EmptyTrash(nsIMsgWindow *msgWindow,
                     trashFolder->PropagateDelete(aFolder, PR_TRUE, msgWindow);
             }
         }
+
+        return NS_OK;
     }
-    return NS_OK;
+
+    return rv;
 }
 
 NS_IMETHODIMP nsImapMailFolder::Delete ()