Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-19 21:04:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

made gpg ids more consistent with the way gpg lists them

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2380 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-02-20 13:36:30 +00:00
parent 449f257ef5
commit c7895aa0e2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
retroshare-gui/src/gui/GenCertDialog.cpp
View File

@ -65,7 +65,8 @@ GenCertDialog::GenCertDialog(QWidget *parent, Qt::WFlags flags)
std::string name, email; std::string name, email;
RsInit::GetPGPLoginDetails(*it, name, email); RsInit::GetPGPLoginDetails(*it, name, email);
std::cerr << "Adding PGPUser: " << name << " id: " << *it << std::endl; std::cerr << "Adding PGPUser: " << name << " id: " << *it << std::endl;
ui.genPGPuser->addItem(QString::fromStdString(name + " <" + email + "> ("+*it+")"), userData); QString gid = QString::fromStdString(*it).right(8) ;
ui.genPGPuser->addItem(QString::fromStdString(name + " <" + email + "> (")+gid+")", userData);
foundGPGKeys = true; foundGPGKeys = true;
} }
} }

2
retroshare-gui/src/gui/StartDialog.cpp
View File

@ -77,7 +77,7 @@ StartDialog::StartDialog(QWidget *parent, Qt::WFlags flags)
const QVariant & userData = QVariant(QString::fromStdString(*it)); const QVariant & userData = QVariant(QString::fromStdString(*it));
std::string gpgid, name, email, location; std::string gpgid, name, email, location;
RsInit::getAccountDetails(*it, gpgid, name, email, location); RsInit::getAccountDetails(*it, gpgid, name, email, location);
QString accountName = QString::fromStdString(name + " (" + gpgid + ") - " + location); QString accountName = QString::fromStdString(name + " (") + QString::fromStdString(gpgid).right(8) + ") - " + QString::fromStdString(location);
ui.loadName->addItem(accountName, userData); ui.loadName->addItem(accountName, userData);
if (preferedId == *it) if (preferedId == *it)