diff --git a/mozilla/mailnews/base/search/src/nsMsgFilterService.cpp b/mozilla/mailnews/base/search/src/nsMsgFilterService.cpp index fddf594068a..1ed9906b660 100644 --- a/mozilla/mailnews/base/search/src/nsMsgFilterService.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgFilterService.cpp @@ -100,7 +100,7 @@ NS_IMETHODIMP nsMsgFilterService::OpenFilterList(nsIFileSpec *filterFile, nsIMsg } else { - NS_RELEASE(filterList); + NS_RELEASE(filterList); if (ret == NS_MSG_FILTER_PARSE_ERROR && aMsgWindow) { ret = BackUpFilterFile(filterFile, aMsgWindow); @@ -110,7 +110,6 @@ NS_IMETHODIMP nsMsgFilterService::OpenFilterList(nsIFileSpec *filterFile, nsIMsg return OpenFilterList(filterFile, rootFolder, aMsgWindow, resultFilterList); } } - return ret; } @@ -169,7 +168,7 @@ NS_IMETHODIMP nsMsgFilterService::SaveFilterList(nsIMsgFilterList *filterList, n } NS_IMETHODIMP nsMsgFilterService::CancelFilterList(nsIMsgFilterList *filterList) -{ +{ return NS_ERROR_NOT_IMPLEMENTED; } diff --git a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp index e2263caeb80..48406a23f86 100644 --- a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp +++ b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp @@ -902,12 +902,11 @@ nsImapIncomingServer::PerformExpand(nsIMsgWindow *aMsgWindow) NS_IMETHODIMP nsImapIncomingServer::PerformBiff() { - nsresult rv; + nsresult rv; nsCOMPtr rootMsgFolder; rv = GetRootMsgFolder(getter_AddRefs(rootMsgFolder)); if(NS_SUCCEEDED(rv) && rootMsgFolder) - rv = rootMsgFolder->GetNewMessages(nsnull, nsnull); - + rv = rootMsgFolder->GetNewMessages(nsnull, nsnull); return rv; }