Commit 1b32d87e authored by Rolf Eike Beer's avatar Rolf Eike Beer
Browse files

Fix decryption of files from command line

Forward-port of r786397 and r786393

svn path=/trunk/KDE/kdeutils/kgpg/; revision=786403
parent 7f98db64
......@@ -470,7 +470,7 @@ void MyView::decryptDroppedFile()
return;
} else*/
{
swapname=KUrl(droppedUrls.first().directory(KUrl::IgnoreTrailingSlash)+oldname);
swapname = KUrl(droppedUrls.first().directory(KUrl::AppendTrailingSlash) + oldname);
QFile fgpg(swapname.path());
if (fgpg.exists())
{
......@@ -486,7 +486,10 @@ void MyView::decryptDroppedFile()
}
KgpgLibrary *lib=new KgpgLibrary(0);
lib->slotFileDec(droppedUrls.first(), swapname, QStringList(KGpgSettings::customDecrypt()));
QStringList custdecr;
if (!KGpgSettings::customDecrypt().isEmpty())
custdecr = QStringList(KGpgSettings::customDecrypt());
lib->slotFileDec(droppedUrls.first(), swapname, custdecr);
connect(lib,SIGNAL(importOver(QStringList)),this,SIGNAL(importedKeys(QStringList)));
connect(lib,SIGNAL(systemMessage(QString,bool)),this,SLOT(busyMessage(QString,bool)));
// if (isFolder)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment