[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/plugins/cryptography
From:       Duncan Mac-Vicar Prett <duncan () kde ! org>
Date:       2007-03-18 13:56:07
Message-ID: 1174226167.968025.22444.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 643818 by dmacvicar:

 port password dialog


 M  +6 -5      kgpginterface.cpp  


--- trunk/KDE/kdenetwork/kopete/plugins/cryptography/kgpginterface.cpp #643817:643818
@@ -20,7 +20,7 @@
 
 
 #include <klocale.h>
-#include <k3passworddialog.h>
+#include <KDE/KPasswordDialog>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -103,10 +103,11 @@
 				passdlg.prepend(i18n("<b>Bad passphrase</b><br> You have %1 tries left.<br>", 4-counter));
 	
 			/// pipe for passphrase
-			int code=K3PasswordDialog::getPassword(0,password,passdlg);
-			if (code!=QDialog::Accepted)
-				return QString();
-			CryptographyPlugin::setCachedPass(password);
+			KPasswordDialog dlg( 0L, KPasswordDialog::NoFlags );
+			dlg.setPrompt( passdlg );
+			if( !dlg.exec() )
+				return QString(); //the user canceled
+			CryptographyPlugin::setCachedPass(dlg.password().toLocal8Bit());
 		}
 	
 		if(passphraseHandling)
[prev in list] [next in list] [prev in thread] [next in thread]