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

Merge of branch v0.6-rssocialnet 7419 to 7488. Changes from electron and myself:

Browse source 
- added possibility to modify groups (e.g. edit circles)
- fixed mismatched free/delete in fimonitor.cc, authssl.cc, pqibin.cc (saving encrypted hash cache file)
- improved plugin interface class to allow plugins to access GXS objects.
- added method to un-register notify clients from RsNotify
- fixed pqisslproxy for windows, due to win not properly supporting sockets in non blocking mode.
- removed static members form RsInitConfig and made RsAccounts object a pointer. This prevents plugin initialisation problems at symbol resolving time.
- removed bool return from p3IdService::getOwnIds()



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7492 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-08-25 21:07:07 +00:00
parent 906efa6f6c
commit f6db432c74
24 changed files with 525 additions and 322 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libretroshare/src/plugins/pluginmanager.cc
View file

@ -406,9 +406,11 @@ void RsPluginManager::registerClientServices(p3ServiceServer *pqih)
std::cerr << " Registering pqi services." << std::endl;
for(uint32_t i=0;i<_plugins.size();++i)
if(_plugins[i].plugin != NULL && _plugins[i].plugin->rs_pqi_service() != NULL)
//if(_plugins[i].plugin != NULL && _plugins[i].plugin->rs_pqi_service() != NULL)
if(_plugins[i].plugin != NULL && _plugins[i].plugin->p3_service() != NULL)
{
pqih->addService(_plugins[i].plugin->rs_pqi_service(), true) ;
//pqih->addService(_plugins[i].plugin->rs_pqi_service(), true) ;
pqih->addService(_plugins[i].plugin->p3_service(), true) ;
std::cerr << " Added pqi service for plugin " << _plugins[i].plugin->getPluginName() << std::endl;
}
}
@ -422,8 +424,10 @@ void RsPluginManager::addConfigurations(p3ConfigMgr *ConfigMgr)
{
if( _plugins[i].plugin->rs_cache_service() != NULL)
ConfigMgr->addConfiguration(_plugins[i].plugin->configurationFileName(), _plugins[i].plugin->rs_cache_service());
else if(_plugins[i].plugin->rs_pqi_service() != NULL)
ConfigMgr->addConfiguration(_plugins[i].plugin->configurationFileName(), _plugins[i].plugin->rs_pqi_service());
//else if(_plugins[i].plugin->rs_pqi_service() != NULL)
// ConfigMgr->addConfiguration(_plugins[i].plugin->configurationFileName(), _plugins[i].plugin->rs_pqi_service());
else if(_plugins[i].plugin->p3_config() != NULL)
ConfigMgr->addConfiguration(_plugins[i].plugin->configurationFileName(), _plugins[i].plugin->p3_config());
else
continue ;