mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-18 12:24:22 -05:00
made gpg ids more consistent with the way gpg lists them
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2380 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
449f257ef5
commit
c7895aa0e2
@ -65,7 +65,8 @@ GenCertDialog::GenCertDialog(QWidget *parent, Qt::WFlags flags)
|
||||
std::string name, email;
|
||||
RsInit::GetPGPLoginDetails(*it, name, email);
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
@ -77,7 +77,7 @@ StartDialog::StartDialog(QWidget *parent, Qt::WFlags flags)
|
||||
const QVariant & userData = QVariant(QString::fromStdString(*it));
|
||||
std::string 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);
|
||||
|
||||
if (preferedId == *it)
|
||||
|
Loading…
Reference in New Issue
Block a user