Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-14 17:15:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ID cleaning. Saving progress.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7125 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-02-16 22:38:50 +00:00
parent 6bc79709e3
commit e2a53924d4
27 changed files with 134 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

14
retroshare-gui/src/gui/common/FriendList.cpp
View file

@ -600,7 +600,7 @@ void FriendList::insertPeers()
}
// get ids of existing private chat messages
std::list<std::string> privateChatIds;
std::list<RsPeerId> privateChatIds;
rsMsgs->getPrivateChatQueueIds(true, privateChatIds);
// get existing groups
@ -608,13 +608,13 @@ void FriendList::insertPeers()
std::list<RsGroupInfo>::iterator groupIt;
rsPeers->getGroupInfoList(groupInfoList);
std::list<std::string> gpgFriends;
std::list<std::string>::iterator gpgIt;
std::list<RsPgpId> gpgFriends;
std::list<RsPgpId>::iterator gpgIt;
rsPeers->getGPGAcceptedList(gpgFriends);
//add own gpg id, if we have more than on location (ssl client)
std::list<std::string> ownSslContacts;
std::string ownId = rsPeers->getGPGOwnId();
std::list<RsPeerId> ownSslContacts;
RsPgpId ownId = rsPeers->getGPGOwnId();
rsPeers->getAssociatedSSLIds(ownId, ownSslContacts);
if (ownSslContacts.size() > 0) {
gpgFriends.push_back(ownId);
@ -700,7 +700,7 @@ void FriendList::insertPeers()
}
}
std::list<std::string> fillGpgIds;
std::list<RsPgpId> fillGpgIds;
// start with groups
groupIt = groupInfoList.begin();
@ -771,7 +771,7 @@ void FriendList::insertPeers()
// iterate through gpg friends
for (gpgIt = gpgFriends.begin(); gpgIt != gpgFriends.end(); gpgIt++) {
std::string gpgId = *gpgIt;
RsPgpId gpgId = *gpgIt;
if (mShowGroups) {
if (groupInfo) {