import ir fixes

1 files changed, 12 insertions, 4 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index dc3cda1..bf6d053 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -399,28 +399,36 @@ void  AddressBook::export2File( QString fileName )
     converter.addresseeToVCard( *it, vcard, version );
     t << vcard << "\r\n";
   }
   t <<  "\r\n\r\n";
   outFile.close(); 
 }
-void  AddressBook::importFromFile( QString fileName )
+void  AddressBook::importFromFile( QString fileName, bool replaceLabel )
 {
 
-    KABC::Addressee::List list;
+  KABC::Addressee::List list;
   QFile file( fileName );
 
   file.open( IO_ReadOnly );
   QByteArray rawData = file.readAll();
   file.close();
-  
-  QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
+  qDebug("AddressBook::importFromFile ");
+  QString data;
+  if ( replaceLabel ) { 
+      data = QString::fromLatin1( rawData.data(), rawData.size() + 1 ); 
+      data.replace ( QRegExp("LABEL") , "ADR" );
+      data.replace ( QRegExp("CHARSET=ISO-8859-1") , "" );
+  } else
+      data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
   KABC::VCardTool tool;
   list =  tool.parseVCards( data );
   KABC::Addressee::List::Iterator it;
   for ( it = list.begin(); it != list.end(); ++it ) {
       (*it).setResource( 0 );
+      if ( replaceLabel )
+          (*it).removeVoice();
       insertAddressee( (*it), false, true );
   }
 
 }
 
 bool AddressBook::saveAB()