more AB sync

1 files changed, 1 insertions, 1 deletions

diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp
index de45e63..430c7b3 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.cpp
+++ b/kabc/plugins/qtopia/qtopiaconverter.cpp
@@ -1,185 +1,185 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 //US
 #include "kglobal.h"
 
 
 #include "qtopiaconverter.h"
 
 #include <qpe/categories.h>
 #include <libkdepim/ksyncprofile.h>
 //US #include <qpe/categoryselect.h>
 
 
 using namespace KABC;
 
 QtopiaConverter::QtopiaConverter() : catDB(0)
 {
 }
 
 QtopiaConverter::~QtopiaConverter()
 {
   deinit();
 }
 
 bool QtopiaConverter::init()
 {
   catDB = new Categories();
 
   if (!catDB)
     return false;
 
   catDB->load( categoryFileName() );
   return true;
 }
 
 void QtopiaConverter::deinit()
 {
   if (catDB)
   {
     delete catDB;
     catDB = 0;
   }
 }
 
 bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &addr )
 {
     // name
     addr.setFormattedName(contact.fileAs());
     addr.setFamilyName( contact.lastName() );
     addr.setGivenName( contact.firstName() );
     addr.setAdditionalName( contact.middleName() );
     addr.setPrefix( contact.nameTitle() );
     addr.setSuffix( contact.suffix() );
 
     addr.setTempSyncStat(  SYNC_TEMPSTATE_NEW_EXTERNAL );
     QString exuid = contact.uid().toString();
     addr.setOriginalExternalUID( exuid );
     int ente = exuid.find( "-0000");
     if ( exuid.left(1) == "{" )
         exuid = exuid.mid(1);
     if ( ente > -1 )
         exuid = exuid.left( ente-1 );
     addr.setExternalUID( exuid );
-    //qDebug("QtopiaConverter:set uid %s ",addr.externalUID().latin1() );
+    qDebug("QtopiaConverter:set %s uid %s ",addr.originalExternalUID().latin1(),addr.externalUID().latin1() );
 
     // email
     QStringList emails = contact.emailList();
     for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
       addr.insertEmail( *it, ((*it) == contact.defaultEmail()) );
     }
 
     if (!contact.defaultEmail().isEmpty())
       addr.insertEmail(contact.defaultEmail(), true);
 
     // home
     if ((!contact.homeStreet().isEmpty()) ||
         (!contact.homeCity().isEmpty()) ||
         (!contact.homeState().isEmpty()) ||
         (!contact.homeZip().isEmpty()) ||
         (!contact.homeCountry().isEmpty()))
     {
       Address homeaddress;
       homeaddress.setType(Address::Home);
 //US    homeaddress.setPostOfficeBox( "" );
 //US    homeaddress.setExtended( "" );
       homeaddress.setStreet( contact.homeStreet() );
       homeaddress.setLocality( contact.homeCity() );
       homeaddress.setRegion( contact.homeState() );
       homeaddress.setPostalCode( contact.homeZip() );
       homeaddress.setCountry( contact.homeCountry() );
 
       addr.insertAddress( homeaddress );
     }
 
     if (!contact.homePhone().isEmpty())
     {
       PhoneNumber homephone;
       homephone.setType( PhoneNumber::Home );
       homephone.setNumber( contact.homePhone() );
       addr.insertPhoneNumber( homephone );
     }
 
     if (!contact.homeFax().isEmpty())
     {
       PhoneNumber homefax;
       homefax.setType( PhoneNumber::Home | PhoneNumber::Fax );
       homefax.setNumber( contact.homeFax() );
       addr.insertPhoneNumber( homefax );
     }
 
     if (!contact.homeMobile().isEmpty())
     {
       PhoneNumber homemobile;
       homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell );
       homemobile.setNumber( contact.homeMobile() );
       addr.insertPhoneNumber( homemobile );
     }
 
     addr.setUrl( contact.homeWebpage() );
 
 
     // business
     if ((!contact.businessStreet().isEmpty()) ||
         (!contact.businessCity().isEmpty()) ||
         (!contact.businessState().isEmpty()) ||
         (!contact.businessZip().isEmpty()) ||
         (!contact.businessCountry().isEmpty()))
     {
       Address businessaddress;
       businessaddress.setType(Address::Work);
 //US    businessaddress.setPostOfficeBox( "" );
 //US    businessaddress.setExtended( "" );
       businessaddress.setStreet( contact.businessStreet() );
       businessaddress.setLocality( contact.businessCity() );
       businessaddress.setRegion( contact.businessState() );
       businessaddress.setPostalCode( contact.businessZip() );
       businessaddress.setCountry( contact.businessCountry() );
 
       addr.insertAddress( businessaddress );
     }
 
 
     if (!contact.businessPhone().isEmpty())
     {
       PhoneNumber businessphone;
       businessphone.setType( PhoneNumber::Work );
       businessphone.setNumber( contact.businessPhone() );
       addr.insertPhoneNumber( businessphone );
     }
 
     if (!contact.businessFax().isEmpty())
     {
       PhoneNumber businessfax;
       businessfax.setType( PhoneNumber::Work | PhoneNumber::Fax );
       businessfax.setNumber( contact.businessFax() );
       addr.insertPhoneNumber( businessfax );
     }
 
     if (!contact.businessMobile().isEmpty())
     {