From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 1 Sep 2010 00:37:02 +0000 Subject: * 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 --- kresources/egroupware/kabc_resourcexmlrpc.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'kresources/egroupware/kabc_resourcexmlrpc.cpp') diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp index ee1e74bea..115484c6a 100644 --- a/kresources/egroupware/kabc_resourcexmlrpc.cpp +++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp @@ -64,8 +64,11 @@ ResourceXMLRPC::ResourceXMLRPC( const KConfig *config ) mPrefs->addGroupPrefix( identifier() ); - if ( config ) + if ( config ) { mPrefs->readConfig(); + } else { + setResourceName( i18n( "eGroupware Server" ) ); + } initEGroupware(); } -- cgit v1.2.1