Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-21 21:04:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merging branches/v0.6-initdev into trunk.

Browse source 
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2014-02-01 14:16:15 +00:00
commit c0738eec7f
407 changed files with 23716 additions and 50779 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/feeds/SubFileItem.cpp
View file

@ -31,7 +31,7 @@
#include "util/misc.h"
#include "gui/RetroShareLink.h"
#include <retroshare/rschannels.h>
//#include <retroshare/rschannels.h>
/****
* #define DEBUG_ITEM 1
@ -601,12 +601,15 @@ void SubFileItem::download()
std::list<std::string> sources ;
std::string destination;
#if 0
if (!mChannelId.empty() && mType == SFI_TYPE_CHANNEL) {
ChannelInfo ci;
if (rsChannels->getChannelInfo(mChannelId, ci)) {
destination = ci.destination_directory;
}
}
#endif
// Add possible direct sources.
//