* 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, 0 deletions

diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
index 0ed562e18..3de0220f0 100644
--- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
+++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
@@ -75,7 +75,13 @@ bool VCard_LDIFCreator::readContents( const TQString &path )
   text.truncate(0);
 
   // read the file
+#if defined(KABC_VCARD_ENCODING_FIX)
+  const TQByteArray data = file.readAll();
+  const TQString contents( data );
+  const TQCString contentsRaw( data.data(), data.size() );
+#else
   TQString contents = file.readAll();
+#endif
   file.close();
 
   // convert the file contents to a KABC::Addressee address
@@ -83,7 +89,11 @@ bool VCard_LDIFCreator::readContents( const TQString &path )
   KABC::Addressee addr;
   KABC::VCardConverter converter;
 
+#if defined(KABC_VCARD_ENCODING_FIX)
+  addrList = converter.parseVCardsRaw( contentsRaw );
+#else
   addrList = converter.parseVCards( contents );
+#endif
   if ( addrList.count() == 0 )
     if ( !KABC::LDIFConverter::LDIFToAddressee( contents, addrList ) )
 	return false;