Integrated turtle download to all kind of user-requested downloads

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1625 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-09-09 20:14:43 +00:00
parent 64a06fd0bb
commit 95a577ccd0
3 changed files with 5 additions and 2 deletions

View File

@ -899,7 +899,6 @@ bool ftController::FileCancel(std::string hash)
}
mDownloads.erase(mit);
mTurtle->stopMonitoringFileTunnels(hash) ;
IndicateConfigChanged(); /* completed transfer -> save */
return true;

View File

@ -251,11 +251,15 @@ bool ftServer::FileRequest(std::string fname, std::string hash, uint64_t size,
const DwlDetails details(fname, hash, size, dest, flags, srcIds, Normal);
mFtDwlQueue->insertDownload(details);
rsTurtle->monitorFileTunnels( fname,hash,size ) ;
return true ;
}
bool ftServer::FileCancel(std::string hash)
{
rsTurtle->stopMonitoringFileTunnels(hash) ;
return mFtController->FileCancel(hash);
}

View File

@ -1005,7 +1005,7 @@ void TransfersDialog::pasteLink()
//downloadFileRequested(linkData.getName (), linkData.getSize ().toInt (),
// linkData.getHash (), "", -1, -1, -1, -1);
rsFiles->FileRequest (linkData.getName ().toStdString (), linkData.getHash ().toStdString (),
linkData.getSize ().toInt (), "", 0, srcIds);
linkData.getSize().toULongLong(), "", 0, srcIds);
}
}