* 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, 0 deletions

diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h
index 6581ec742..4a2885b00 100644
--- a/kmail/cachedimapjob.h
+++ b/kmail/cachedimapjob.h
@@ -121,8 +121,16 @@ protected slots:
   virtual void slotListMessagesResult( KIO::Job * job );
   void slotDeleteNextMessages( KIO::Job* job = 0 );
   void slotProcessedSize( KIO::Job *, KIO::filesize_t processed );
+  void slotSubscribtionChange1Done( const TQString&, bool );
+  void slotSubscribtionChange2Done( const TQString&, bool );
+  void slotSubscribtionChange1Failed( const TQString &errorMessage );
+  void slotSubscribtionChange2Failed( const TQString &errorMessage );
 
 private:
+
+  void renameOnDisk();
+  void revertLabelChange();
+
   KMFolderCachedImap *mFolder;
   KMAcctCachedImap   *mAccount;
   TQValueList<KMFolderCachedImap*> mFolderList;
@@ -133,6 +141,7 @@ private:
   TQStringList mFoldersOrMessages; // Folder deletion: path list. Message deletion: sets of uids
   KMMessage* mMsg;
   TQString mString; // Used as uids and as rename target
+  TQString mOldImapPath, mNewImapPath, mNewName; // used for renaming
   KMFolderCachedImap *mParentFolder;
 };