From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 1 Sep 2010 00:37:02 +0000
Subject: * 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
---
 kmail/imapaccountbase.h | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'kmail/imapaccountbase.h')

diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 26d7a4b01..39fb33b69 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -187,8 +187,10 @@ namespace KMail {
      * Subscribe (@p subscribe = TRUE) / Unsubscribe the folder
      * identified by @p imapPath.
      * Emits subscriptionChanged signal on success.
+     * Emits subscriptionChangeFailed signal when it fails.
+     * @param quiet if false, an error message will be displayed if the job fails.
      */
-    void changeSubscription(bool subscribe, const TQString& imapPath);
+    void changeSubscription(bool subscribe, const TQString& imapPath, bool quiet = false );
 
     /**
      * Returns whether the account is locally subscribed to the
@@ -252,9 +254,10 @@ namespace KMail {
     virtual void cancelMailCheck();
 
     /**
-     * Init a new-mail-check for a single folder
+     * Init a new-mail-check for a single folder, and optionally its subfolders.
      */
-    void processNewMailSingleFolder(KMFolder* folder);
+    enum FolderListType { Single, Recursive };
+    void processNewMailInFolder( KMFolder* folder, FolderListType type = Single );
 
     /**
      * Return true if we are processing a mailcheck for a single folder
@@ -323,7 +326,7 @@ namespace KMail {
     /**
      * Returns the root folder of this account
      */
-    virtual FolderStorage* const rootFolder() const = 0;
+    virtual FolderStorage* rootFolder() const = 0;
 
     /**
      * Progress item for listDir
@@ -585,6 +588,12 @@ namespace KMail {
      */
     void subscriptionChanged(const TQString& imapPath, bool subscribed);
 
+    /**
+     * Emitted when changeSubscription() failed.
+     * @param errorMessage the error message that contains the reason for the failure
+     */
+    void subscriptionChangeFailed( const TQString &errorMessage );
+
     /**
      * Emitted upon completion of the job for setting the status for a group of UIDs,
      * as a result of a setImapStatus call.
@@ -595,7 +604,8 @@ namespace KMail {
     /**
      * Emitted when the get-user-rights job is done,
      * as a result of a getUserRights call.
-     * Use userRights() to retrieve them, they will still be on 0 if the job failed.
+     * Use userRights() to retrieve them after using userRightsState() to see if the results are
+     * valid.
      */
     void receivedUserRights( KMFolder* folder );
 
-- 
cgit v1.2.1