mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

75936. r=suresh sr=bienvenu. No need to use copy service

This commit is contained in:
naving%netscape.com 2001-05-16 01:40:32 +00:00
Родитель ff95c4500b
Коммит aefdf581f5
1 изменённых файлов: 3 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
mailnews/base/src/nsMsgSearchDBView.cpp
Просмотреть файл

@ -363,8 +363,6 @@ nsMsgSearchDBView::OnStopCopy(nsresult aStatus)
nsresult nsMsgSearchDBView::ProcessRequestsInOneFolder(nsIMsgWindow *window)
{
nsresult rv = NS_OK;
nsCOMPtr<nsIMsgCopyServiceListener> copyServListener;//= do_QueryInterface(this);
rv = this->QueryInterface(NS_GET_IID(nsIMsgCopyServiceListener), getter_AddRefs(copyServListener));
nsCOMPtr <nsISupports> curSupports = getter_AddRefs(m_uniqueFolders->ElementAt(mCurIndex));
NS_ASSERTION(curSupports, "curSupports is null");
@ -375,17 +373,16 @@ nsresult nsMsgSearchDBView::ProcessRequestsInOneFolder(nsIMsgWindow *window)
// called for delete with trash, copy and move
if (mCommand == nsMsgViewCommandType::deleteMsg)
curFolder->DeleteMessages(messageArray, window, PR_FALSE /* delete storage */, PR_FALSE /* is move*/, copyServListener, PR_FALSE /*allowUndo*/);
curFolder->DeleteMessages(messageArray, window, PR_FALSE /* delete storage */, PR_FALSE /* is move*/, this, PR_FALSE /*allowUndo*/);
else
{
NS_WITH_SERVICE(nsIMsgCopyService, copyService, kMsgCopyServiceCID,&rv);
NS_ASSERTION(!(curFolder == mDestFolder), "The source folder and the destination folder are the same");
if (NS_SUCCEEDED(rv) && curFolder != mDestFolder)
{
if (mCommand == nsMsgViewCommandType::moveMessages)
copyService->CopyMessages(curFolder, messageArray, mDestFolder, PR_TRUE /* isMove */,copyServListener, window, PR_FALSE /*allowUndo*/);
mDestFolder->CopyMessages(curFolder, messageArray, PR_TRUE /* isMove */,window, this, PR_FALSE /*is_Folder*/, PR_FALSE /*allowUndo*/);
else if (mCommand == nsMsgViewCommandType::copyMessages)
copyService->CopyMessages(curFolder, messageArray, mDestFolder, PR_FALSE /* isMove */,copyServListener, window, PR_FALSE /*allowUndo*/);
mDestFolder->CopyMessages(curFolder, messageArray, PR_FALSE /* isMove */, window, this, PR_FALSE /*is_Folder*/, PR_FALSE /*allowUndo*/);
}
}
return rv;