* 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, 5 insertions, 2 deletions

diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp
index ba3b886f..7e6b5c9c 100644
--- a/kaddressbook/kabtools.cpp
+++ b/kaddressbook/kabtools.cpp
@@ -80,12 +80,15 @@ void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab )
       KABC::VCardConverter converter;
       KABC::Addressee::List list;
       list.append( addressee );
+#if defined(KABC_VCARD_ENCODING_FIX)
+      const TQCString vcard = converter.createVCardsRaw( list, KABC::VCardConverter::v3_0 );
+      file.writeBlock( vcard, vcard.length() );
+#else
       TQString vcard = converter.createVCards( list, KABC::VCardConverter::v3_0 );
-
       TQTextStream t( &file );
       t.setEncoding( TQTextStream::UnicodeUTF8 );
       t << vcard;
-
+#endif
       file.close();
 
       KURL url( path );