Remove the "bounce" feature. It doesn't make sense and should not be

advertised.

svn path=/trunk/kdepim/; revision=357703

kmfilteraction.cpp

@@ -529,41 +529,6 @@ KMFilterAction::ReturnCode KMFilterActionWithCommand::genericProcess(KMMessage*
 //
 //=============================================================================
 
-//=============================================================================
-// KMFilterActionBounce - bounce
-// Return mail as undelivered.
-//=============================================================================
-class KMFilterActionBounce : public KMFilterActionWithNone
-{
-public:
-  KMFilterActionBounce();
-  virtual ReturnCode process(KMMessage* msg) const;
-  static KMFilterAction* newAction(void);
-};
-
-KMFilterAction* KMFilterActionBounce::newAction(void)
-{
-  return (new KMFilterActionBounce);
-}
-
-KMFilterActionBounce::KMFilterActionBounce()
-  : KMFilterActionWithNone( "bounce", i18n("Bounce") )
-{
-}
-
-KMFilterAction::ReturnCode KMFilterActionBounce::process(KMMessage* msg) const
-{
-  KMMessage *bounceMsg = msg->createBounce( FALSE );
-  if ( !bounceMsg ) return ErrorButGoOn;
-
-  // Queue message. This is a) so that the user can check
-  // the bounces before sending and b) for speed reasons.
-  kmkernel->msgSender()->send( bounceMsg, FALSE );
-
-  return GoOn;
-}
-
-
 //=============================================================================
 // KMFilterActionSendReceipt - send receipt
 // Return delivery receipt.
@@ -1741,7 +1706,6 @@ void KMFilterActionDict::init(void)
   insert( KMFilterActionReplyTo::newAction );
   insert( KMFilterActionForward::newAction );
   insert( KMFilterActionRedirect::newAction );
-  insert( KMFilterActionBounce::newAction );
   insert( KMFilterActionSendReceipt::newAction );
   insert( KMFilterActionExec::newAction );
   insert( KMFilterActionExtFilter::newAction );

kmmainwidget.cpp

@@ -1307,15 +1307,6 @@ void KMMainWidget::slotRedirectMsg()
   command->start();
 }
 
-
-//-----------------------------------------------------------------------------
-void KMMainWidget::slotBounceMsg()
-{
-  KMCommand *command = new KMBounceCommand( this, mHeaders->currentMsg() );
-  command->start();
-}
-
-
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotReplyListToMsg()
 {
@@ -2128,7 +2119,6 @@ void KMMainWidget::slotMsgPopup(KMMessage&, const KURL &aUrl, const QPoint& aPoi
       mReplyAuthorAction->plug( menu );
       mReplyListAction->plug( menu );
       mForwardActionMenu->plug(menu);
-      mBounceAction->plug(menu);
     }
     menu->insertSeparator();
     if ( !out_folder ) {
@@ -2423,10 +2413,6 @@ void KMMainWidget::setupActions()
   mNoQuoteReplyAction = new KAction( i18n("Reply Without &Quote..."), SHIFT+Key_R,
     this, SLOT(slotNoQuoteReplyToMsg()), actionCollection(), "noquotereply" );
 
-  //---- Bounce action
-  mBounceAction = new KAction( i18n("&Bounce..."), 0, this,
-			      SLOT(slotBounceMsg()), actionCollection(), "bounce" );
-
   //----- Create filter actions
   mFilterMenu = new KActionMenu( i18n("&Create Filter"), "filter", actionCollection(), "create_filter" );
   connect( mFilterMenu, SIGNAL(activated()), this,
@@ -3074,7 +3060,6 @@ void KMMainWidget::updateMessageActions()
     kmkernel->folderIsDraftOrOutbox(mFolder));
     replyMenu()->setEnabled( single_actions );
     filterMenu()->setEnabled( single_actions );
-    bounceAction()->setEnabled( single_actions );
     replyAction()->setEnabled( single_actions );
     noQuoteReplyAction()->setEnabled( single_actions );
     replyAuthorAction()->setEnabled( single_actions );

kmmainwidget.h

@@ -106,7 +106,6 @@ public:
   KAction *forwardAction() const { return mForwardAction; }
   KAction *forwardAttachedAction() const { return mForwardAttachedAction; }
   KAction *redirectAction() const { return mRedirectAction; }
-  KAction *bounceAction() const { return mBounceAction; }
   KAction *noQuoteReplyAction() const { return mNoQuoteReplyAction; }
   KActionMenu *filterMenu() const { return mFilterMenu; }
   KAction *printAction() const { return mPrintAction; }
@@ -374,7 +373,6 @@ protected slots:
   void slotForwardMsg();
   void slotForwardAttachedMsg();
   void slotRedirectMsg();
-  void slotBounceMsg();
   void slotNoQuoteReplyToMsg();
   void slotSubjectFilter();
   void slotMailingListFilter();
@@ -395,7 +393,7 @@ private:
   KAction *mPrintAction, *mReplyAction, *mReplyAllAction, *mReplyAuthorAction,
       *mReplyListAction,
       *mForwardAction, *mForwardAttachedAction, *mRedirectAction,
-      *mBounceAction, *mNoQuoteReplyAction;
+      *mNoQuoteReplyAction;
   KActionMenu *mReplyActionMenu;
   KActionMenu *mForwardActionMenu;
   // Filter actions

kmmainwin.rc

@@ -98,7 +98,6 @@
      <Action name="message_forward_inline" />
      <Action name="message_forward_redirect" />
    </Menu>
-   <Action name="bounce" />
    <Action name="send_again" />
    <Separator/>
    <Action name="copy_to" />

kmreadermainwin.cpp

@@ -165,14 +165,6 @@ void KMReaderMainWin::slotRedirectMsg()
   command->start();
 }
 
-
-//-----------------------------------------------------------------------------
-void KMReaderMainWin::slotBounceMsg()
-{
-  KMCommand *command = new KMBounceCommand( this, mReaderWin->message() );
-  command->start();
-}
-
 //-----------------------------------------------------------------------------
 void KMReaderMainWin::slotShowMsgSrc()
 {
@@ -232,10 +224,6 @@ void KMReaderMainWin::setupAccel()
 				 actionCollection(), "message_forward_redirect" );
   mForwardActionMenu->insert( mRedirectAction );
 
-  mBounceAction = new KAction( i18n("&Bounce..."), 0, this,
-			      SLOT(slotBounceMsg()), actionCollection(), "bounce" );
-
-
   mReplyActionMenu = new KActionMenu( i18n("Message->","&Reply"),
                                       "mail_reply", actionCollection(),
                                       "message_reply_menu" );
@@ -314,7 +302,6 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const QPoi
     mReplyAuthorAction->plug( menu );
     mReplyListAction->plug( menu );
     mForwardActionMenu->plug( menu );
-    mBounceAction->plug( menu );
 
     menu->insertSeparator();