merge with 0.3.2

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@877 34ebc366-c3a9-4b3c-9f84-69acf7962910

1 files changed, 3 insertions, 3 deletions

diff --git a/keygendialog.cpp b/keygendialog.cpp
index 8b50557..fc07524 100644
--- a/keygendialog.cpp
+++ b/keygendialog.cpp
@@ -41,10 +41,10 @@ void KeyGenDialog::generateKeyDialog()
     commentEdit = new QLineEdit(this);
 
     keySizeSpinBox = new QSpinBox(this);
-    keySizeSpinBox->setRange(1024, 65536);
+    keySizeSpinBox->setRange(768, 16384);
     keySizeSpinBox->setValue(2048);
 
-    keySizeSpinBox->setSingleStep(1024);
+    keySizeSpinBox->setSingleStep(256);
 
     keyTypeComboBox = new QComboBox(this);
     keyTypeComboBox->addItem("DSA/Elgamal");
@@ -153,7 +153,7 @@ void KeyGenDialog::keyGenAccept()
             keyGenParams += "Name-Comment: " + commentEdit->text().toUtf8() + "\n";
         }
         if (!(emailEdit->text().isEmpty())) {
-            keyGenParams += "Name-Email: " + emailEdit->text() + "\n";
+            keyGenParams += "Name-Email: " + emailEdit->text().toUtf8() + "\n";
         }
         if (expireCheckBox->checkState()) {
             keyGenParams += "Expire-Date: 0\n";