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

Show the RetroShare id of the peer and the signers of the key in ConfCertDialog as clickable links.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4212 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-05-18 21:23:26 +00:00
parent c3f2f788c4
commit 4c13280fed
4 changed files with 45 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/RetroShareLink.cpp
View file

@ -36,6 +36,7 @@
#include "msgs/MessageComposer.h"
#include "util/misc.h"
#include "common/PeerDefs.h"
#include "gui/connect/ConfCertDialog.h"
#include <retroshare/rsfiles.h>
#include <retroshare/rspeers.h>
@ -431,6 +432,7 @@ QString RetroShareLink::title() const
case TYPE_FILE:
return QString("%1 (%2)").arg(hash()).arg(misc::friendlyUnit(size()));
case TYPE_PERSON:
return PeerDefs::rsidFromId(hash().toStdString());
case TYPE_FORUM:
case TYPE_CHANNEL:
case TYPE_SEARCH:
@ -693,6 +695,7 @@ bool RetroShareLink::process(int flag)
}
if (rsPeers->setAcceptToConnectGPGCertificate(hash().toStdString(), true)) {
ConfCertDialog::loadAll();
if (flag & RSLINK_PROCESS_NOTIFY_SUCCESS) {
QMessageBox mb(QObject::tr("Friend Request Confirmation"), QObject::tr("The friend has been added to your list."),QMessageBox::Information,QMessageBox::Ok,0,0);
mb.setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
@ -814,7 +817,7 @@ bool RetroShareLink::process(int flag)
#endif
RsPeerDetails detail;
if (rsPeers->getPeerDetails(hash().toStdString(), detail)) {
if (detail.accept_connection || detail.id == rsPeers->getOwnId()) {
if (detail.accept_connection || detail.id == rsPeers->getOwnId() || detail.id == rsPeers->getGPGOwnId()) {
MessageComposer *msg = MessageComposer::newMsg();
msg->addRecipient(MessageComposer::TO, detail.id, false);
if (subject().isEmpty() == false) {