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

Fixed usage of utf8 characters in certificate links (gpg and location name) (Patch from Asamk)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4935 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-02-13 21:09:38 +00:00
parent 8675eb9225
commit dcf23e0ccb
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/RetroShareLink.cpp
View File

@ -298,8 +298,6 @@ bool RetroShareLink::createCertificate(const std::string& ssl_id)
} }
//_ssl_id = QString::fromStdString(id); //_ssl_id = QString::fromStdString(id);
_name = QString::fromUtf8(detail.name.c_str());
QString gpg_cert = QString::fromStdString(invite) ;
QString gpg_base_64 = QString::fromStdString(invite).section("\n\n",1).section("-----",0,0) ; QString gpg_base_64 = QString::fromStdString(invite).section("\n\n",1).section("-----",0,0) ;
_GPGBase64CheckSum = gpg_base_64.section("=",-1,-1).section("\n",0,0) ; _GPGBase64CheckSum = gpg_base_64.section("=",-1,-1).section("\n",0,0) ;
@ -310,8 +308,8 @@ bool RetroShareLink::createCertificate(const std::string& ssl_id)
_GPGid = QString::fromStdString(detail.gpg_id).right(8); _GPGid = QString::fromStdString(detail.gpg_id).right(8);
_SSLid = QString::fromStdString(ssl_id) ; _SSLid = QString::fromStdString(ssl_id) ;
_GPGBase64String = gpg_base_64.replace("\n","") ; _GPGBase64String = gpg_base_64.replace("\n","") ;
_location = QString::fromStdString(detail.location) ; _location = QString::fromUtf8(detail.location.c_str()) ;
_name = QString::fromStdString(detail.name) ; _name = QString::fromUtf8(detail.name.c_str()) ;
_ext_ip_port = QString::fromStdString(invite).section("--EXT--",1,1) ; _ext_ip_port = QString::fromStdString(invite).section("--EXT--",1,1) ;
QString lst = QString::fromStdString(invite).section("--EXT--",0,0) ; QString lst = QString::fromStdString(invite).section("--EXT--",0,0) ;
@ -627,7 +625,7 @@ QString RetroShareLink::niceName() const
} }
if(type() == TYPE_CERTIFICATE) if(type() == TYPE_CERTIFICATE)
return QString("RetroShare Certificate (") + _name + ", @ " + _location + ")" ; // should add SSL id there return QString("RetroShare Certificate (%1, @%2)").arg(_name, _location); // should add SSL id there
return name(); return name();
} }