[kde-base/kmail] Clean unneeded patches

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

2 files changed, 5 insertions, 42 deletions

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 261f854ecde9..256ddf2d2445 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.169 2009/06/14 11:10:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.170 2009/06/14 13:13:19 alexxy Exp $
+
+  14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org>
+  -files/kmail-4.2.3-allow_replying_to_messages_in_sent_folder.patch:
+  Clean unneeded patches
 
   14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org> -kmail-4.2.3.ebuild,
   -kmail-4.2.3-r1.ebuild:
diff --git a/kde-base/kmail/files/kmail-4.2.3-allow_replying_to_messages_in_sent_folder.patch b/kde-base/kmail/files/kmail-4.2.3-allow_replying_to_messages_in_sent_folder.patch
deleted file mode 100644
index 4b67e92a591d..000000000000
--- a/kde-base/kmail/files/kmail-4.2.3-allow_replying_to_messages_in_sent_folder.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=270099
-https://bugs.kde.org/show_bug.cgi?id=189464
-http://websvn.kde.org/?view=rev&revision=965008
-
---- kmail/kmmainwidget.cpp
-+++ kmail/kmmainwidget.cpp
-@@ -3450,9 +3450,7 @@
-       menu->addAction( mUseAction );
-     } else {
- 
--      if ( !mFolder->isSent() ) {
--        menu->addAction( mMsgActions->replyMenu() );
--      }
-+      menu->addAction( mMsgActions->replyMenu() );
-       menu->addAction( mForwardActionMenu );
-     }
-     menu->addAction(editAction());
---- kmail/messageactions.cpp
-+++ kmail/messageactions.cpp
-@@ -170,8 +170,7 @@
- {
-   bool singleMsg = (mCurrentMessage != 0);
-   if ( mCurrentMessage && mCurrentMessage->parent() ) {
--    if ( mCurrentMessage->parent()->isSent() ||
--         mCurrentMessage->parent()->isTemplates())
-+    if ( mCurrentMessage->parent()->isTemplates() )
-       singleMsg = false;
-   }
-   const bool multiVisible = mVisibleSernums.count() > 0 || mCurrentMessage;
---- kmail/messagelistview/widget.cpp
-+++ kmail/messagelistview/widget.cpp
-@@ -618,8 +618,7 @@
-     menu.addAction( mMainWidget->useAction() );
-   } else {
-     // show most used actions
--    if( !folder()->isSent() )
--      menu.addAction( mMainWidget->messageActions()->replyMenu() );
-+    menu.addAction( mMainWidget->messageActions()->replyMenu() );
-     menu.addAction( mMainWidget->forwardMenu() );
-     if( mMainWidget->sendAgainAction()->isEnabled() )
-       menu.addAction( mMainWidget->sendAgainAction() );