mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-28 16:17:28 -04:00
Merge of branch v0.6-rssocialnet 7419 to 7488. Changes from electron and myself:
- 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:
parent
906efa6f6c
commit
f6db432c74
24 changed files with 525 additions and 322 deletions
|
@ -26,6 +26,7 @@
|
|||
|
||||
#include "pqi/p3notify.h"
|
||||
#include <stdint.h>
|
||||
#include <algorithm>
|
||||
|
||||
RsNotify *rsNotify = NULL ;
|
||||
|
||||
|
@ -284,3 +285,16 @@ void p3Notify::registerNotifyClient(NotifyClient *cl)
|
|||
notifyClients.push_back(cl) ;
|
||||
}
|
||||
|
||||
bool p3Notify::unregisterNotifyClient(NotifyClient *nc)
|
||||
{
|
||||
std::list<NotifyClient*>::iterator it = std::find(notifyClients.begin(), notifyClients.end(), nc);
|
||||
if(it != notifyClients.end())
|
||||
{
|
||||
notifyClients.erase(it);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue