1 files changed, 10 insertions, 6 deletions

diff --git a/src/ui/KeyMgmt.cpp b/src/ui/KeyMgmt.cpp
index 2904dd0c..1078778e 100755
--- a/src/ui/KeyMgmt.cpp
+++ b/src/ui/KeyMgmt.cpp
@@ -234,9 +234,11 @@ void KeyMgmt::deleteKeysWithWarning(QStringList *uidList)
     }
     QString keynames;
     foreach (QString uid, *uidList) {
-        keynames.append(QString::fromUtf8(mCtx->getKeyDetails(uid)->uids->name));
+        GpgKey key;
+        mCtx->getKeyDetails(uid, key);
+        keynames.append(key.name);
         keynames.append("<i> &lt;");
-        keynames.append(QString::fromUtf8(mCtx->getKeyDetails(uid)->uids->email));
+        keynames.append(key.email);
         keynames.append("&gt; </i><br/>");
     }
 
@@ -256,8 +258,9 @@ void KeyMgmt::slotShowKeyDetails()
         return;
     }
 
-    // TODO: first...?
-    gpgme_key_t key = mCtx->getKeyDetails(mKeyList->getSelected()->first());
+    GpgKey key;
+
+    mCtx->getKeyDetails(mKeyList->getSelected()->first(), key);
 
     new KeyDetailsDialog(mCtx, key);
 }
@@ -268,8 +271,9 @@ void KeyMgmt::slotExportKeyToFile()
     if (!mCtx->exportKeys(mKeyList->getChecked(), keyArray)) {
         return;
     }
-    gpgme_key_t key = mCtx->getKeyDetails(mKeyList->getChecked()->first());
-    QString fileString = QString::fromUtf8(key->uids->name) + " " + QString::fromUtf8(key->uids->email) + "(" + QString(key->subkeys->keyid)+ ")_pub.asc";
+    GpgKey key;
+    mCtx->getKeyDetails(mKeyList->getChecked()->first(), key);
+    QString fileString = key.name + " " + key.email+ "(" + key.id+ ")_pub.asc";
 
     QString fileName = QFileDialog::getSaveFileName(this, tr("Export Key To File"), fileString, tr("Key Files") + " (*.asc *.txt);;All Files (*)");
     QFile file(fileName);