From 2dc5d7bc3f11bae4444c9817bff79ba9a458a3e2 Mon Sep 17 00:00:00 2001
From: Allen Winter <winter@kde.org>
Date: Sun, 1 Apr 2007 22:42:05 +0000
Subject: [PATCH] forward port SVN commit 645830 by wstephens and 649046 by
 winterz:

Don't crash if we can't find the folder.

svn path=/trunk/KDE/kdepim/; revision=649049
---
 kmfilteraction.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/kmfilteraction.cpp b/kmfilteraction.cpp
index e682e9ead..55f4042c5 100644
--- a/kmfilteraction.cpp
+++ b/kmfilteraction.cpp
@@ -1376,9 +1376,9 @@ public:
   static KMFilterAction* newAction(void);
 };
 
-KMFilterAction* KMFilterActionCopy::newAction(void)
+KMFilterAction* KMFilterActionCopy::newAction( void )
 {
-  return (new KMFilterActionCopy);
+  return ( new KMFilterActionCopy );
 }
 
 KMFilterActionCopy::KMFilterActionCopy()
@@ -1391,7 +1391,7 @@ KMFilterAction::ReturnCode KMFilterActionCopy::process( KMMessage *msg ) const
   // TODO opening and closing the folder is a trade off.
   // Perhaps Copy is a seldomly used action for now,
   // but I gonna look at improvements ASAP.
-  if ( !mFolder && mFolder->open( "filtercopy" ) != 0 ) {
+  if ( !mFolder || mFolder->open( "filtercopy" ) != 0 ) {
     return ErrorButGoOn;
   }
 
@@ -1418,27 +1418,27 @@ void KMFilterActionCopy::processAsync( KMMessage *msg ) const
   cmd->start();
 }
 
-bool KMFilterActionCopy::requiresBody(KMMsgBase*) const
+bool KMFilterActionCopy::requiresBody( KMMsgBase *msg ) const
 {
-    return true;
+  Q_UNUSED( msg );
+  return true;
 }
 
-
 //=============================================================================
 // KMFilterActionForward - forward to
 // Forward message to another user
 //=============================================================================
 class KMFilterActionForward: public KMFilterActionWithAddress
 {
-public:
-  KMFilterActionForward();
-  virtual ReturnCode process(KMMessage* msg) const;
-  static KMFilterAction* newAction(void);
+  public:
+    KMFilterActionForward();
+    virtual ReturnCode process( KMMessage *msg ) const;
+    static KMFilterAction* newAction( void );
 };
 
-KMFilterAction* KMFilterActionForward::newAction(void)
+KMFilterAction *KMFilterActionForward::newAction( void )
 {
-  return (new KMFilterActionForward);
+  return ( new KMFilterActionForward );
 }
 
 KMFilterActionForward::KMFilterActionForward()
@@ -1446,7 +1446,7 @@ KMFilterActionForward::KMFilterActionForward()
 {
 }
 
-KMFilterAction::ReturnCode KMFilterActionForward::process(KMMessage* aMsg) const
+KMFilterAction::ReturnCode KMFilterActionForward::process( KMMessage *aMsg ) const
 {
   if ( mParameter.isEmpty() )
     return ErrorButGoOn;