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

Updated retroshare-gui to match libretroshare interface changes.

Browse source 
* remove calls to rsPeers->setAcceptToConnectGPGCertificate();
 * these are replaced with addFriend() / removeFriend().
 * renamed rsPeers->getSSLChildListOfGPGId() => rsPeers->getAssociatedSSLIds().



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4543 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2011-08-07 21:14:09 +00:00
parent 8e3e7d5209
commit b082362c58
8 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View file

@ -366,7 +366,7 @@ void MessageComposer::processSettings(bool bLoad)
if (detail.isOnlyGPGdetail) {
//put all sslChilds in message list
std::list<std::string> sslIds;
rsPeers->getSSLChildListOfGPGId(id, sslIds);
rsPeers->getAssociatedSSLIds(id, sslIds);
std::list<std::string>::const_iterator it;
for (it = sslIds.begin(); it != sslIds.end(); it++) {
@ -859,7 +859,7 @@ static void calculateGroupsOfSslIds(std::list<RsGroupInfo> &existingGroupInfos,
std::map<std::string, std::list<std::string> >::iterator it = gpgToSslIds.find(*peerIt);
if (it == gpgToSslIds.end()) {
rsPeers->getSSLChildListOfGPGId(*peerIt, sslIds);
rsPeers->getAssociatedSSLIds(*peerIt, sslIds);
gpgToSslIds[*peerIt] = sslIds;
} else {
@ -896,7 +896,7 @@ static void calculateGroupsOfSslIds(std::list<RsGroupInfo> &existingGroupInfos,
std::map<std::string, std::list<std::string> >::iterator it = gpgToSslIds.find(*peerIt);
if (it == gpgToSslIds.end()) {
rsPeers->getSSLChildListOfGPGId(*peerIt, sslIds);
rsPeers->getAssociatedSSLIds(*peerIt, sslIds);
gpgToSslIds[*peerIt] = sslIds;
} else {
@ -1209,7 +1209,7 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
std::list<std::string>::const_iterator groupIt;
for (groupIt = groupInfo.peerIds.begin(); groupIt != groupInfo.peerIds.end(); groupIt++) {
std::list<std::string> sslIds;
rsPeers->getSSLChildListOfGPGId(*groupIt, sslIds);
rsPeers->getAssociatedSSLIds(*groupIt, sslIds);
std::list<std::string>::const_iterator sslIt;
for (sslIt = sslIds.begin(); sslIt != sslIds.end(); sslIt++) {
@ -1578,7 +1578,7 @@ void MessageComposer::addRecipient(enumType type, const std::string &id, bool gr
}
if (detail.isOnlyGPGdetail) {
if (!rsPeers->getSSLChildListOfGPGId(id, sslIds)) {
if (!rsPeers->getAssociatedSSLIds(id, sslIds)) {
return;
}
} else {