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

fixed up plugin system to work with v0.6

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7287 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-04-20 14:20:13 +00:00
parent 2d2a906ef2
commit ca6b463a31
7 changed files with 134 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libretroshare/src/rsserver/rsinit.cc
View file

@ -1258,9 +1258,9 @@ int RsServer::StartupRetroShare()
std::vector<std::string> plugins_directories ;
#ifndef WINDOWS_SYS
plugins_directories.push_back(std::string("/usr/lib/retroshare/extensions/")) ;
plugins_directories.push_back(std::string("/usr/lib/retroshare/extensions6/")) ;
#endif
std::string extensions_dir = rsAccounts.PathBaseDirectory() + "/extensions/" ;
std::string extensions_dir = rsAccounts.PathBaseDirectory() + "/extensions6/" ;
plugins_directories.push_back(extensions_dir) ;
if(!RsDirUtil::checkCreateDirectory(extensions_dir))
@ -1280,8 +1280,7 @@ int RsServer::StartupRetroShare()
// cache directories, get pointers to cache strapper, or access ownId()
//
mPluginsManager->setCacheDirectories(localcachedir,remotecachedir) ;
mPluginsManager->setFileServer(ftserver) ;
mPluginsManager->setLinkMgr(mLinkMgr) ;
mPluginsManager->setServiceControl(serviceCtrl) ;
// Now load the plugins. This parses the available SO/DLL files for known symbols.
//
@ -1491,8 +1490,6 @@ int RsServer::StartupRetroShare()
interfaces.mTurtle = rsTurtle;
interfaces.mDisc = rsDisc;
interfaces.mDht = rsDht;
// don't exist no more.
//interfaces.mForums = mForums;
interfaces.mNotify = mNotify;
mPluginsManager->setInterfaces(interfaces);