A couple of bug fixes from Andreas Gungl.

If the public key of the sender of an encrypted message cannot be found
then reread the database of keys.

Add a cancel button to the dialog that prompts for the users passphrase
as before they had to close the passphrase dialogbox to cancel.

svn path=/trunk/kdenetwork/kmail/; revision=56069

kpgp.cpp

@@ -490,6 +490,9 @@ Kpgp::getPublicKey(QString _person)
   for(str=publicKeys.first(); str!=0; str=publicKeys.next())
     if(str.contains(adress)) return str;
 
+  // reread the database, because key wasn't found...
+  publicKeys = pgp->pubKeys();
+
   // FIXME: let user set the key/ get from keyserver
   // now check if the address contains the key
   adress = _person.lower();
@@ -765,9 +768,9 @@ Kpgp::SelectPublicKey(QStrList pbkeys, const char *caption)
 //  widgets needed by kpgp
 //----------------------------------------------------------------------
 
-KpgpPass::KpgpPass(QWidget *parent, const char *name, bool modal )
-  :KDialogBase( i18n("OpenPGP Security Check"), Yes, Yes, Yes, parent, name, 
-	       modal, true, i18n("&OK") )
+KpgpPass::KpgpPass(QWidget *parent, const QString &name, bool modal )
+  :KDialogBase( parent, name, modal, i18n("OpenPGP Security Check"), 
+                Ok|Cancel )
 {
   QHBox *hbox = makeHBoxMainWidget();
   hbox->setSpacing( spacingHint() );

kpgp.h

@@ -7,7 +7,7 @@
  * @author "J. Nick Koston" <bdraco@the.system.is.halted.net> 
  *
  * PGP6 and other enhancements
- * @author Andreas Gungl <Andreas.Gungl@osp-dd.de>
+ * @author Andreas Gungl <a.gungl@gmx.de>
  */
 #ifndef KPGP_H
 #define KPGP_H
@@ -194,7 +194,7 @@ class KpgpPass : public KDialogBase
   Q_OBJECT
 
   public:
-    KpgpPass(QWidget *parent=0, const char *name=0, bool modal=true );
+    KpgpPass(QWidget *parent=0, const QString &name=QString::null, bool modal=true );
     virtual ~KpgpPass();
 
     static QString getPassphrase(QWidget *parent = 0);