* 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

1 files changed, 6 insertions, 1 deletions

diff --git a/kresources/newexchange/kcal_resourceexchange.cpp b/kresources/newexchange/kcal_resourceexchange.cpp
index 4c9f7726d..37d99d376 100644
--- a/kresources/newexchange/kcal_resourceexchange.cpp
+++ b/kresources/newexchange/kcal_resourceexchange.cpp
@@ -25,6 +25,7 @@
 #include <groupwaredownloadjob.h>
 #include <groupwareuploadjob.h>
 #include <kresources_groupwareprefs.h>
+#include <klocale.h>
 
 using namespace KCal;
 
@@ -38,7 +39,11 @@ ResourceExchange::ResourceExchange( const KConfig *config )
   : ResourceGroupwareBase( config )
 {
   init();
-  if ( config ) readConfig( config );
+  if ( config ) {
+    readConfig( config );
+  } else {
+    setResourceName( i18n( "Exchange Server" ) );
+  }
 }
 
 void ResourceExchange::init()