From 0ee455edb62a254fb1b7e6faa9448121215ed219 Mon Sep 17 00:00:00 2001
From: ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>
Date: Mon, 2 Apr 2012 20:47:43 +0000
Subject: merge with 0.3.2

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@877 34ebc366-c3a9-4b3c-9f84-69acf7962910
---
 keydetailsdialog.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'keydetailsdialog.cpp')

diff --git a/keydetailsdialog.cpp b/keydetailsdialog.cpp
index aeaa69c..5a66122 100644
--- a/keydetailsdialog.cpp
+++ b/keydetailsdialog.cpp
@@ -34,12 +34,12 @@ KeyDetailsDialog::KeyDetailsDialog(GpgME::GpgContext* ctx, gpgme_key_t key, QWid
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
     connect(buttonBox, SIGNAL(rejected()), this, SLOT(close()));
 
-    nameVarLabel = new QLabel(key->uids->name);
+    nameVarLabel = new QLabel(QString::fromUtf8(key->uids->name));
     nameVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
-    emailVarLabel = new QLabel(key->uids->email);
+    emailVarLabel = new QLabel(QString::fromUtf8(key->uids->email));
     emailVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
 
-    commentVarLabel = new QLabel(key->uids->comment);
+    commentVarLabel = new QLabel(QString::fromUtf8(key->uids->comment));
     commentVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
     keyidVarLabel = new QLabel(key->subkeys->keyid);
     keyidVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
@@ -195,7 +195,7 @@ void KeyDetailsDialog::exportPrivateKey()
         QByteArray *keyArray = new QByteArray();
         mCtx->exportSecretKey(*keyid, keyArray);
         gpgme_key_t key = mCtx->getKeyDetails(*keyid);
-        QString fileString = QString(key->uids->name) + " " + QString(key->uids->email) + "(" + QString(key->subkeys->keyid)+ ")_pub_sec.asc";
+        QString fileString = QString::fromUtf8(key->uids->name) + " " + QString::fromUtf8(key->uids->email) + "(" + QString(key->subkeys->keyid)+ ")_pub_sec.asc";
         QString fileName = QFileDialog::getSaveFileName(this, tr("Export Key To File"), fileString, tr("Key Files") + " (*.asc *.txt);;All Files (*)");
         QFile file(fileName);
         if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-- 
cgit v1.2.3