* 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, 15 insertions, 1 deletions

diff --git a/kmail/kmailIface.h b/kmail/kmailIface.h
index fd47f0485..2338a4c40 100644
--- a/kmail/kmailIface.h
+++ b/kmail/kmailIface.h
@@ -60,6 +60,19 @@ k_dcop:
                             const TQString &attachParamValue,
                             const TQCString &attachContDisp,
                             const TQCString &attachCharset) = 0;
+  virtual int openComposer (const TQString &to, const TQString &cc,
+                            const TQString &bcc, const TQString &subject,
+                            const TQString &body, int hidden,
+                            const TQString &attachName,
+                            const TQCString &attachCte,
+                            const TQCString &attachData,
+                            const TQCString &attachType,
+                            const TQCString &attachSubType,
+                            const TQCString &attachParamAttr,
+                            const TQString &attachParamValue,
+                            const TQCString &attachContDisp,
+                            const TQCString &attachCharset,
+                            uint identity) = 0;
   /** Open composer and return reference to DCOP interface of composer window.
     If hidden is true, the window will not be shown. If you use that option,
     it's your responsibility to call the send() function of the composer in
@@ -102,6 +115,7 @@ k_dcop:
   virtual int dcopAddMessage(const TQString & foldername,
                              const KURL & messagefile,
                              const TQString & MsgStatusFlags = TQString()) = 0;
+  virtual void showImportArchiveDialog() = 0;
 
   virtual TQStringList folderList() const =0;
   virtual DCOPRef getFolder( const TQString& vpath ) =0;
@@ -211,7 +225,7 @@ k_dcop_hidden:
   /** Clears the list of added message ids which is used to filter out
       duplicates. */
   virtual void dcopResetAddMessage() = 0;
-  
+
   virtual void loadProfile( const TQString& path ) = 0;
   virtual void saveToProfile( const TQString& path ) const = 0;
 };