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

Fixed umlauts (utf8) in Windows. Changed some parameters to reference pointer. Added virtual folders to the lib.

Browse source 
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3509 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-09-17 18:27:30 +00:00
parent dccfbf20b0
commit ed737e2c9f
21 changed files with 892 additions and 914 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libretroshare/src/ft/ftdbase.cc
View file

@ -198,6 +198,7 @@ std::list<RsItem *> ftFiMonitor::saveList(bool &cleanup)
{
RsFileConfigItem *fi = new RsFileConfigItem();
fi->file.path = (*it).filename ;
fi->file.name = (*it).virtualname ;
fi->flags = (*it).shareflags ;
sList.push_back(fi);
@ -234,6 +235,7 @@ bool ftFiMonitor::loadList(std::list<RsItem *> load)
SharedDirInfo info ;
info.filename = fi->file.path;
info.virtualname = fi->file.name;
info.shareflags = fi->flags & (RS_FILE_HINTS_BROWSABLE | RS_FILE_HINTS_NETWORK_WIDE) ;
dirList.push_back(info) ;
@ -252,7 +254,7 @@ void ftFiMonitor::updateShareFlags(const SharedDirInfo& info)
IndicateConfigChanged();
}
void ftFiMonitor::setSharedDirectories(std::list<SharedDirInfo> dirList)
void ftFiMonitor::setSharedDirectories(std::list<SharedDirInfo>& dirList)
{
FileIndexMonitor::setSharedDirectories(dirList);

2
libretroshare/src/ft/ftdbase.h
View file

@ -63,7 +63,7 @@ class ftFiMonitor: public FileIndexMonitor, public ftSearch, public p3Config
virtual bool search(std::string hash, uint32_t hintflags, FileInfo &info) const;
/* overloaded set dirs enables config indication */
virtual void setSharedDirectories(std::list<SharedDirInfo> dirList);
virtual void setSharedDirectories(std::list<SharedDirInfo>& dirList);
virtual void updateShareFlags(const SharedDirInfo& info) ;
/***

1
libretroshare/src/ft/ftfilecreator.cc
View file

@ -235,7 +235,6 @@ int ftFileCreator::locked_initializeFileAttrs()
#ifdef FILE_DEBUG
std::cerr << "ftFileCreator::initializeFileAttrs() trying (r+b) " << file_name << " this: " << this << std::endl;
#endif
std::cerr << std::endl;
}
/*

2
libretroshare/src/ft/ftserver.cc
View file

@ -578,7 +578,7 @@ bool ftServer::setSharedDirectories(std::list<SharedDirInfo> &dirs)
return true;
}
bool ftServer::addSharedDirectory(SharedDirInfo dir)
bool ftServer::addSharedDirectory(SharedDirInfo& dir)
{
std::list<SharedDirInfo> dirList;
mFiMon->getSharedDirectories(dirList);

2
libretroshare/src/ft/ftserver.h
View file

@ -191,7 +191,7 @@ virtual std::string getPartialsDirectory();
virtual bool getSharedDirectories(std::list<SharedDirInfo> &dirs);
virtual bool setSharedDirectories(std::list<SharedDirInfo> &dirs);
virtual bool addSharedDirectory(SharedDirInfo dir);
virtual bool addSharedDirectory(SharedDirInfo& dir);
virtual bool updateShareFlags(const SharedDirInfo& dir); // updates the flags. The directory should already exist !
virtual bool removeSharedDirectory(std::string dir);