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 --- kaddressbook/thumbnailcreator/ldifvcardcreator.cpp | 10 ++++++++++ kaddressbook/thumbnailcreator/ldifvcardcreator.h | 1 + kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop | 1 - 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'kaddressbook/thumbnailcreator') diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp index 0ed562e1..3de0220f 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; diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.h b/kaddressbook/thumbnailcreator/ldifvcardcreator.h index 7b5cface..2de6c7b4 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.h +++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.h @@ -23,6 +23,7 @@ #include #include +#include // for KABC_VCARD_ENCODING_FIX define class KPixmapSplitter; diff --git a/kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop b/kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop index 2eb63ab5..90d73eac 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop +++ b/kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop @@ -25,7 +25,6 @@ Name[hu]=Elektronikus névjegykártyák Name[is]=Skrár með rafrænum nafnspjöldum Name[it]=Biglietto da visita elettronico Name[ja]=電子ビジネスカードファイル -Name[ka]=ელექტრონული სავიზიტო ბარათების ფაილები Name[kk]=Электрондық визитка файлдары Name[km]=ឯកសារ​នាមប័ណ្ណ​អេឡិចត្រូនិច Name[lt]=Elektroninės verslo kortelės bylos -- cgit v1.2.3