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

Use sslid to add a location when accepting a friend request from the security item with a known pgp key.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6668 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-09-01 22:18:39 +00:00
parent 8239c69963
commit 4559b48a9d
5 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp
View file

@ -23,8 +23,8 @@
#include <retroshare/rspeers.h>
FriendRequestToaster::FriendRequestToaster(const std::string &gpgId, const QString &sslName, const std::string &/*peerId*/)
: QWidget(NULL), mGpgId(gpgId)
FriendRequestToaster::FriendRequestToaster(const std::string &gpgId, const QString &sslName, const std::string &peerId)
: QWidget(NULL), mGpgId(gpgId), mSslId(peerId), mSslName(sslName)
{
/* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this);
@ -59,7 +59,7 @@ void FriendRequestToaster::friendrequestButtonSlot()
{
ConnectFriendWizard *connectFriendWizard = new ConnectFriendWizard;
connectFriendWizard->setAttribute(Qt::WA_DeleteOnClose, true);
connectFriendWizard->setGpgId(mGpgId, true);
connectFriendWizard->setGpgId(mGpgId, mSslId, true);
connectFriendWizard->show();
hide();