From c7895aa0e245431ddd87f890e6b2cb9aae4e9d48 Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 20 Feb 2010 13:36:30 +0000 Subject: [PATCH] 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 --- retroshare-gui/src/gui/GenCertDialog.cpp | 3 ++- retroshare-gui/src/gui/StartDialog.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp index af846447f..59b8dd612 100644 --- a/retroshare-gui/src/gui/GenCertDialog.cpp +++ b/retroshare-gui/src/gui/GenCertDialog.cpp @@ -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; } } diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp index 4adc80237..ba2956184 100644 --- a/retroshare-gui/src/gui/StartDialog.cpp +++ b/retroshare-gui/src/gui/StartDialog.cpp @@ -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)