* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 8 deletions

diff --git a/kmail/messageactions.h b/kmail/messageactions.h
index 39e9f937..41279c55 100644
--- a/kmail/messageactions.h
+++ b/kmail/messageactions.h
@@ -55,19 +55,20 @@ class MessageActions : public QObject
 
     KAction* editAction() const { return mEditAction; }
 
+  signals:
+
+    // This signal is emitted when a reply is triggered and the
+    // action has finished.
+    // This is useful for the stand-alone reader, it might want to close the window in
+    // that case.
+    void replyActionFinished();
+
   public slots:
     void editCurrentMessage();
 
   private:
     void updateActions();
-    template<typename T> void replyCommand()
-    {
-      if ( !mCurrentMessage )
-        return;
-      const TQString text = mMessageView ? mMessageView->copyText() : "";
-      KMCommand *command = new T( mParent, mCurrentMessage, text );
-      command->start();
-    }
+    template<typename T> void replyCommand();
     void setMessageStatus( KMMsgStatus status, bool toggle = false );
 
   private slots: