diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
| commit | cc29364f06178f8f6b457384f2ec37a042bd9d43 (patch) | |
| tree | 7c77a3184c698bbf9d98cef09fb1ba8124daceba /kfile-plugins/vcf | |
| parent | 4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff) | |
| download | tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip | |
* 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
Diffstat (limited to 'kfile-plugins/vcf')
| -rw-r--r-- | kfile-plugins/vcf/kfile_vcf.cpp | 7 | ||||
| -rw-r--r-- | kfile-plugins/vcf/kfile_vcf.desktop | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/kfile-plugins/vcf/kfile_vcf.cpp b/kfile-plugins/vcf/kfile_vcf.cpp index 76b3383c6..5dcfc2c17 100644 --- a/kfile-plugins/vcf/kfile_vcf.cpp +++ b/kfile-plugins/vcf/kfile_vcf.cpp @@ -68,8 +68,11 @@ bool KVcfPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ ) file.close(); KABC::VCardConverter converter; - KABC::Addressee addr = converter.parseVCard(contents); - +#if defined(KABC_VCARD_ENCODING_FIX) + KABC::Addressee addr = converter.parseVCardRaw( contents.utf8() ); +#else + KABC::Addressee addr = converter.parseVCard( contents ); +#endif KFileMetaInfoGroup group = appendGroup(info, "Technical"); // prepare the text diff --git a/kfile-plugins/vcf/kfile_vcf.desktop b/kfile-plugins/vcf/kfile_vcf.desktop index ced0dfc34..4d1c5b4b3 100644 --- a/kfile-plugins/vcf/kfile_vcf.desktop +++ b/kfile-plugins/vcf/kfile_vcf.desktop @@ -26,7 +26,6 @@ Name[hu]=VCard-jellemzők Name[is]=vCard upplýsingar Name[it]=Informazioni vCard Name[ja]=vCard 情報 -Name[ka]=vCard ინფორმაცია Name[kk]=vCard мәліметі Name[km]=ព័ត៌មាន vCard Name[lt]=vCard informacija |