summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRolf Eike Beer <kde@opensource.sf-tec.de>2012-02-22 17:27:20 (GMT)
committerRolf Eike Beer <kde@opensource.sf-tec.de>2012-02-22 17:30:04 (GMT)
commite20a07f0a470ad0de5d7ce8a6d4a202d81daa874 (patch)
tree1f7c447e3300fb2dc360e939e65fdc709324a902
parent751c40508de14dfc4f756ec6e5388d849d63004f (diff)
do not overwrite keyserver search string when importing keys
-rw-r--r--keyservers.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/keyservers.cpp b/keyservers.cpp
index a967857..09cde3d 100644
--- a/keyservers.cpp
+++ b/keyservers.cpp
@@ -1,10 +1,7 @@
-/***************************************************************************
- keyservers.cpp - description
- -------------------
- begin : Tue Nov 26 2002
- copyright : (C) 2002 by Jean-Baptiste Mardelle
- email : bj@altern.org
- ***************************************************************************/
+/*
+ * Copyright (C) 2002 Jean-Baptiste Mardelle <bj@altern.org>
+ * Copyright (C) 2006,2007,2008,2009,2010,2012 Rolf Eike Beer <kde@opensource.sf-tec.de>
+ */
/***************************************************************************
* *
@@ -326,9 +323,9 @@ void KeyServer::slotPreImport()
KMessageBox::sorry(this, i18n("You must choose a key."));
return;
}
- page->kLEimportid->setText(m_listpop->kLEID->text());
+ const QStringList keys = m_listpop->kLEID->text().simplified().split(QLatin1Char(' '));
m_dialogserver->close();
- slotImport();
+ startImport(keys, page->kCBimportks->currentText(), page->kLEproxyI->text());
}
void KeyServer::slotPreExport()