Diffstat (limited to 'kaddressbook/xxport/vcard_xxport.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 91df96d..9a8fa68 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp | |||
@@ -206,17 +206,23 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | |||
206 | if ( rawData.at( start+1 ) == '\n' ) | 206 | if ( rawData.at( start+1 ) == '\n' ) |
207 | if ( rawData.at( start+2 ) == ' ' ) { | 207 | if ( rawData.at( start+2 ) == ' ' ) { |
208 | rawData.remove(start,3); | 208 | rawData.remove(start,3); |
209 | --start; | 209 | --start; |
210 | } | 210 | } |
211 | ++start; | 211 | ++start; |
212 | } | 212 | } |
213 | #endif | 213 | #endif |
214 | int ret = KMessageBox::warningYesNoCancel( 0, i18n("Select import format!\nDefault and standard is Utf8.\nLatin1 may be the right\nfor some West Europian languages."), i18n("Import Format"), i18n("Utf8"), i18n("Latin1") ); | ||
215 | if ( ret == KMessageBox::Cancel ) | ||
216 | return addrList; | ||
217 | if ( ret == KMessageBox::Yes ) | ||
214 | addrList = parseVCard( QString::fromUtf8( rawData.data() ) ); | 218 | addrList = parseVCard( QString::fromUtf8( rawData.data() ) ); |
219 | else | ||
220 | addrList = parseVCard( QString::fromLatin1( rawData.data() ) ); | ||
215 | } | 221 | } |
216 | 222 | ||
217 | } | 223 | } |
218 | #endif //KAB_EMBEDDED | 224 | #endif //KAB_EMBEDDED |
219 | 225 | ||
220 | return addrList; | 226 | return addrList; |
221 | } | 227 | } |
222 | 228 | ||