Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Integrated turtle download to all kind of user-requested downloads

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libretroshare/src/ft/ftcontroller.cc
View File

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

4
libretroshare/src/ft/ftserver.cc
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); const DwlDetails details(fname, hash, size, dest, flags, srcIds, Normal);
mFtDwlQueue->insertDownload(details); mFtDwlQueue->insertDownload(details);
rsTurtle->monitorFileTunnels( fname,hash,size ) ;
return true ; return true ;
} }
bool ftServer::FileCancel(std::string hash) bool ftServer::FileCancel(std::string hash)
{ {
rsTurtle->stopMonitoringFileTunnels(hash) ;
return mFtController->FileCancel(hash); return mFtController->FileCancel(hash);
} }

2
retroshare-gui/src/gui/TransfersDialog.cpp
View File

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