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

merged remaining of v0.6-IdCleaning branch (7180->7213) to incorporate global router stuff in trunk

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-03-29 14:18:05 +00:00
parent 0e6302ac6a
commit 1042744685
53 changed files with 2387 additions and 1904 deletions
Download patch file Download diff file Expand all files Collapse all files

23
retroshare-gui/src/gui/MessagesDialog.cpp
View file

@ -1114,19 +1114,28 @@ void MessagesDialog::insertMessages()
text.clear();
std::list<RsPeerId>::const_iterator pit;
for (pit = msgInfo.msgto.begin(); pit != msgInfo.msgto.end(); pit++)
for(std::list<RsPeerId>::const_iterator pit = msgInfo.rspeerid_msgto.begin(); pit != msgInfo.rspeerid_msgto.end(); pit++)
{
if (text.isEmpty() == false) {
if (!text.isEmpty())
text += ", ";
}
std::string peerName = rsPeers->getPeerName(*pit);
if (peerName.empty()) {
if (peerName.empty())
text += PeerDefs::rsid("", *pit);
} else {
else
text += QString::fromUtf8(peerName.c_str());
}
for(std::list<RsGxsId>::const_iterator pit = msgInfo.rsgxsid_msgto.begin(); pit != msgInfo.rsgxsid_msgto.end(); pit++)
{
if (!text.isEmpty())
text += ", ";
// We should improve this by showing the real names of each GXS id.
std::string peerName = "GXS_id("+(*pit).toStdString() + ")" ;
if (peerName.empty())
text += PeerDefs::rsid("", *pit);
else
text += QString::fromUtf8(peerName.c_str());
}
}
} else {
std::cerr << "MessagesDialog::insertMsgTxtAndFiles() Couldn't find Msg" << std::endl;