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 /kresources/newexchange/kabc_resourceexchange.cpp | |
| 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 'kresources/newexchange/kabc_resourceexchange.cpp')
| -rw-r--r-- | kresources/newexchange/kabc_resourceexchange.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kresources/newexchange/kabc_resourceexchange.cpp b/kresources/newexchange/kabc_resourceexchange.cpp index 8b32a4fac..7b08423a5 100644 --- a/kresources/newexchange/kabc_resourceexchange.cpp +++ b/kresources/newexchange/kabc_resourceexchange.cpp @@ -26,13 +26,19 @@ #include "groupwareuploadjob.h" #include "kresources_groupwareprefs.h" +#include <klocale.h> + using namespace KABC; ResourceExchange::ResourceExchange( const KConfig *config ) : ResourceGroupwareBase( config ) { init(); - if ( config ) readConfig( config ); + if ( config ) { + readConfig( config ); + } else { + setResourceName( i18n( "Exchange Server" ) ); + } } void ResourceExchange::init() |