1 files changed, 2 insertions, 0 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 939296f..9b059d3 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -301,48 +301,49 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
            mXXPortManager, SLOT( importVCard( const KURL& ) ) );
 
   connect( mDetails, SIGNAL( browse( const QString& ) ),
            SLOT( browse( const QString& ) ) );
 
 
   mAddressBookService = new KAddressBookService( this );
 
 #endif //KAB_EMBEDDED
   mEditorDialog = 0;
   createAddresseeEditorDialog( this );
   setModified( false );
 }
 
 KABCore::~KABCore()
 {
     //  save();
     //saveSettings();
     //KABPrefs::instance()->writeConfig();
     delete AddresseeConfig::instance();
   mAddressBook = 0;
   KABC::StdAddressBook::close();
 
   delete syncManager;
+
 }
 
 void KABCore::restoreSettings()
 {
   mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce;
 
   bool state;
 
   if (mMultipleViewsAtOnce)
     state = KABPrefs::instance()->mDetailsPageVisible;
   else
     state = false;
 
   mActionDetails->setChecked( state );
   setDetailsVisible( state );
 
   state = KABPrefs::instance()->mJumpButtonBarVisible;
 
   mActionJumpBar->setChecked( state );
   setJumpButtonBarVisible( state );
 /*US
  QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter;
   if ( splitterSize.count() == 0 ) {
     splitterSize.append( width() / 2 );
@@ -681,48 +682,49 @@ void KABCore::export2phone()
                               KPimGlobalPrefs::instance()->mEx2PhoneConnection,
                               KPimGlobalPrefs::instance()->mEx2PhoneModel );
 
     QStringList uids = mViewManager->selectedUids();
     if ( uids.isEmpty() )
         return;
 
 #ifdef _WIN32_
     QString  fileName = locateLocal("tmp", "tempfile.vcf");
 #else
     QString  fileName = "/tmp/kdepimtemp.vcf";
 #endif
 
   KABC::VCardConverter converter;
   QString description;
   QString datastream;
   for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
       KABC::Addressee a = mAddressBook->findByUid( *it );
 
       if ( a.isEmpty() )
           continue;
       a.simplifyEmails();
       a.simplifyPhoneNumbers();
       a.simplifyPhoneNumberTypes();
+      a.simplifyAddresses();
 
       if (description.isEmpty())
           description = a.formattedName();
       QString vcard;
       QString vcardnew;
       converter.addresseeToVCard( a, vcard );
       int start = 0;
       int next;
       while ( (next = vcard.find("TYPE=", start) )>= 0 ) {
           int semi = vcard.find(";", next);
           int dopp = vcard.find(":", next);
           int sep;
           if ( semi < dopp && semi >= 0 )
               sep = semi ;
           else
               sep = dopp;
           vcardnew +=vcard.mid( start, next - start);
           vcardnew +=vcard.mid( next+5,sep -next -5 ).upper();
           start = sep;
       }
       vcardnew += vcard.mid( start,vcard.length() );
       vcard = "";
       start = 0;
       while ( (next = vcardnew.find("ADR", start) )>= 0 ) {