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

List:       kde-commits
Subject:    kdenetwork/kmail
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2003-01-17 0:33:05
[Download RAW message or body]

CVS commit by mutz: 

Trying to fix the KMail side of "KMail doesn't understand me if I hit "Cancel" in pinentry".


  M +3 -1      kmcomposewin.cpp   1.643
  M +4 -2      kmreaderwin.cpp   1.610
  M +2 -1      kmreaderwin.h   1.150
  M +1 -1      objecttreeparser.cpp   1.27


--- kdenetwork/kmail/kmcomposewin.cpp  #1.642:1.643
@@ -3095,4 +3095,6 @@ QByteArray KMComposeWin::pgpSignedMsg( Q
                 }
                 signature.assign( ciphertext, cipherLen );
+            } else if ( errId == /*GPGME_Canceled*/20 ) {
+                return false;
             } else {
                 QString error("#");

--- kdenetwork/kmail/kmreaderwin.cpp  #1.609:1.610
@@ -1439,5 +1439,6 @@ void KMReaderWin::showMessageAndSetData(
                                          const QString& txt2a,
                                          const QString& txt2b,
-                                         QCString& data )
+                                         QCString& data,
+                                         bool showMessageBox )
 {
   data  = "<hr><b><h2>";
@@ -1454,4 +1455,5 @@ void KMReaderWin::showMessageAndSetData(
   data += txt2b.utf8();
   data += "</i>";
+  if ( showMessageBox )
   KMessageBox::sorry(this, txt0+"\n\n"+txt1+"\n\n"+txt2a+"\n"+txt2b);
 }

--- kdenetwork/kmail/kmreaderwin.h  #1.149:1.150
@@ -378,5 +378,6 @@ protected:
                                       const QString& txt2a,
                                       const QString& txt2b,
-                                      QCString& data );
+                                      QCString& data,
+                                      bool showMessageBox=true );
 
   /** Feeds the HTML widget with the contents of the given message-body

--- kdenetwork/kmail/objecttreeparser.cpp  #1.26:1.27
@@ -901,5 +901,5 @@ bool ObjectTreeParser::okDecryptMIME( pa
                  "your specifications made in the "
                  "'Settings->Configure KMail->Security' dialog."),
-          decryptedData );
+          decryptedData, (errId != /*GPGME_Canceled*/20) );
       }
       delete errTxt;


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