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 /libkdenetwork/gpgmepp/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 'libkdenetwork/gpgmepp/util.h')
| -rw-r--r-- | libkdenetwork/gpgmepp/util.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libkdenetwork/gpgmepp/util.h b/libkdenetwork/gpgmepp/util.h index c8786bdcb..8246cfc32 100644 --- a/libkdenetwork/gpgmepp/util.h +++ b/libkdenetwork/gpgmepp/util.h @@ -28,6 +28,10 @@ #include <iostream> #endif +static inline const char * protect( const char * s ) { + return s ? s : "<null>" ; +} + static inline gpgme_keylist_mode_t add_to_gpgme_keylist_mode_t( unsigned int oldmode, unsigned int newmodes ) { if ( newmodes & GpgME::Context::Local ) oldmode |= GPGME_KEYLIST_MODE_LOCAL; if ( newmodes & GpgME::Context::Extern ) oldmode |= GPGME_KEYLIST_MODE_EXTERN; |