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

List:       kde-commits
Subject:    kdepim/kmail
From:       Ingo Klöcker <kloecker () kde ! org>
Date:       2003-10-08 23:20:16
[Download RAW message or body]

CVS commit by kloecker: 

- Don't check for missing attachments in case the user saves the message in the \
Drafts folder. (an 'easy-to-fix bug' reported by Dirk; I wished all easy-to-fix bugs \
                would be that easy to fix.)
- Don't sign/encrypt the composed message when printing it.


  M +4 -5      kmcomposewin.cpp   1.738
  M +1 -2      kmcomposewin.h   1.215


--- kdepim/kmail/kmcomposewin.h  #1.214:1.215
@@ -280,6 +280,5 @@ public:
    * case of an error (e.g. if PGP encryption fails).
    * If backgroundMode is true then no functions which might require
-   * user interaction (like signing/encrypting/checking for missing
-   * attachments) are performed
+   * user interaction (like signing/encrypting) are performed
    */
    bool applyChanges( bool backgroundMode = false );

--- kdepim/kmail/kmcomposewin.cpp  #1.737:1.738
@@ -1499,8 +1499,4 @@ bool KMComposeWin::applyChanges( bool ba
   }
 
-  if ( !backgroundMode )
-    if ( userForgotAttachment() )
-      return false;
-
   bccMsgList.clear();
 
@@ -4886,5 +4882,5 @@ void KMComposeWin::slotPrint()
                                ( mTransport->lineEdit() &&
                                  mTransport->lineEdit()->edited() ) );
-  applyChanges();
+  applyChanges( true );
   KMCommand *command = new KMPrintCommand( this, mMsg );
   command->start();
@@ -4918,4 +4914,7 @@ bool KMComposeWin::doSend(int aSendNow, 
         }
      }
+
+     if ( userForgotAttachment() )
+       return false;
   }
 


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