diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
commit | cc29364f06178f8f6b457384f2ec37a042bd9d43 (patch) | |
tree | 7c77a3184c698bbf9d98cef09fb1ba8124daceba /kmail/kleo_util.h | |
parent | 4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff) | |
download | tdepim-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/kleo_util.h')
-rw-r--r-- | kmail/kleo_util.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kmail/kleo_util.h b/kmail/kleo_util.h index b2378e9fa..dc0eb6d2c 100644 --- a/kmail/kleo_util.h +++ b/kmail/kleo_util.h @@ -77,5 +77,12 @@ static inline bool isOpenPGP( Kleo::CryptoMessageFormat f ) { return f == Kleo::InlineOpenPGPFormat || f == Kleo::OpenPGPMIMEFormat ; } +static inline bool containsSMIME( unsigned int f ) { + return f & (Kleo::SMIMEFormat|Kleo::SMIMEOpaqueFormat) ; +} + +static inline bool containsOpenPGP( unsigned int f ) { + return f & (Kleo::OpenPGPMIMEFormat|Kleo::InlineOpenPGPFormat) ; +} #endif // __KDEPIM_KMAIL_KLEO_UTIL_H__ |