* 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, 10 insertions, 6 deletions

diff --git a/kresources/lib/addressbookadaptor.cpp b/kresources/lib/addressbookadaptor.cpp
index 900772e56..80da39421 100644
--- a/kresources/lib/addressbookadaptor.cpp
+++ b/kresources/lib/addressbookadaptor.cpp
@@ -32,9 +32,9 @@
 using namespace KABC;
 
 
-AddressBookUploadItem::AddressBookUploadItem( 
-                                        KPIM::GroupwareDataAdaptor *adaptor, 
-                                        KABC::Addressee addr, 
+AddressBookUploadItem::AddressBookUploadItem(
+                                        KPIM::GroupwareDataAdaptor *adaptor,
+                                        KABC::Addressee addr,
                                         GroupwareUploadItem::UploadType type )
     : GroupwareUploadItem( type )
 {
@@ -42,7 +42,11 @@ AddressBookUploadItem::AddressBookUploadItem(
   setUrl( addr.custom( adaptor->identifier(), "storagelocation" ) );
   setUid( addr.uid() );
   KABC::VCardConverter vcard;
+#if defined(KABC_VCARD_ENCODING_FIX)
+  setData( vcard.createVCardRaw( addr ) );
+#else
   setData( vcard.createVCard( addr ) );
+#endif
 }
 
 
@@ -105,12 +109,12 @@ void AddressBookAdaptor::addressbookItemDownloaded( KABC::Addressee addr,
   deleteItem( newLocalId );
   TQString localId = idMapper()->localId( remoteId.path() );
   if ( !localId.isEmpty() ) deleteItem( localId );
-  
+
   // add the new item
   addr.insertCustom( identifier(), "storagelocation", storagelocation );
   if ( !localId.isEmpty() ) addr.setUid( localId );
   addItem( addr );
-  
+
   // update the fingerprint and the ids in the idMapper
   idMapper()->removeRemoteId( localId );
   idMapper()->removeRemoteId( newLocalId );
@@ -123,7 +127,7 @@ void AddressBookAdaptor::clearChange( const TQString &uid )
   mResource->clearChange( uid );
 }
 
-KPIM::GroupwareUploadItem *AddressBookAdaptor::newUploadItem( 
+KPIM::GroupwareUploadItem *AddressBookAdaptor::newUploadItem(
               KABC::Addressee addr, KPIM::GroupwareUploadItem::UploadType type )
 {
   return new AddressBookUploadItem( this, addr, type );