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

Added a new page for user request to ConnectFriendWizard.

Browse source 
The page is shown instead of the conclusion page when the user clicks on the certificate link in a message of type user request.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5432 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-08-16 10:20:34 +00:00
parent aedac9738a
commit 21e97a47df
8 changed files with 325 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -449,6 +449,7 @@ void RetroShareLink::clear()
{
_valid = false;
_type = TYPE_UNKNOWN;
_subType = 0;
_hash = "" ;
_size = 0 ;
_name = "" ;
@ -945,7 +946,7 @@ static void processList(const QStringList &list, const QString &textSingular, co
std::cerr << RS_Certificate.toStdString() << std::endl;
ConnectFriendWizard connectFriendWizard;
connectFriendWizard.setCertificate(RS_Certificate);
connectFriendWizard.setCertificate(RS_Certificate, (link.subType() == RSLINK_SUBTYPE_CERTIFICATE_USER_REQUEST) ? true : false);
connectFriendWizard.exec();
needNotifySuccess = false;
}