summaryrefslogtreecommitdiffstats
path: root/kmail/folderdiaacltab.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /kmail/folderdiaacltab.h
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* 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
Diffstat (limited to 'kmail/folderdiaacltab.h')
-rw-r--r--kmail/folderdiaacltab.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index 87b296eef..6576d13e6 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -33,6 +33,7 @@
#define FOLDERDIAACL_H
#include "kmfolderdia.h"
+#include "acljobs.h"
#include "kmfoldertype.h"
class KMFolderImap;
@@ -137,6 +138,7 @@ private:
TQString mImapPath;
ImapAccountBase* mImapAccount;
int mUserRights;
+ KMail::ACLJobs::ACLFetchState mUserRightsState;
KMFolderType mFolderType;
ACLList mInitialACLList;
ACLList mACLList; // to be set