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

fixed display of message links in composer window and message window. Still takes several attempts to display correctly.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7352 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-05-08 08:39:04 +00:00
parent a946504bb5
commit 3766449bec
4 changed files with 51 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -72,7 +72,7 @@ const QString PeerDefs::rsidFromId(const RsGxsId &id, QString *name /* = NULL*/)
{
QString rsid;
// Check own GXS ids.
// Check own GXS ids first, since they can be obtained faster.
//
std::list<RsGxsId> gxs_ids ;
rsIdentity->getOwnIds(gxs_ids) ;
@ -95,6 +95,18 @@ const QString PeerDefs::rsidFromId(const RsGxsId &id, QString *name /* = NULL*/)
return rsid ;
}
RsIdentityDetails details ;
if(rsIdentity->getIdDetails(id,details))
{
std::string peerName = details.mNickname ;
rsid = PeerDefs::rsid(peerName, id);
if(name)
*name = QString::fromUtf8(peerName.c_str());
return rsid ;
}
rsid = PeerDefs::rsid("", id);
if (name)