5 files changed, 171 insertions, 38 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 6e8d027..3ec0795 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -64,714 +64,715 @@ struct AddressBook::Iterator::IteratorData
 {
  Addressee::List::Iterator mIt;
 };
 struct AddressBook::ConstIterator::ConstIteratorData
 {
  Addressee::List::ConstIterator mIt;
 };
 AddressBook::Iterator::Iterator()
 {
  d = new IteratorData;
 }
 AddressBook::Iterator::Iterator( const AddressBook::Iterator &i )
 {
  d = new IteratorData;
  d->mIt = i.d->mIt;
 }
 AddressBook::Iterator &AddressBook::Iterator::operator=( const AddressBook::Iterator &i )
 {
  if( this == &i ) return *this; // guard against self assignment
  delete d; // delete the old data the Iterator was completely constructed before
  d = new IteratorData;
  d->mIt = i.d->mIt;
  return *this;
 }
 AddressBook::Iterator::~Iterator()
 {
  delete d;
 }
 const Addressee &AddressBook::Iterator::operator*() const
 {
  return *(d->mIt);
 }
 Addressee &AddressBook::Iterator::operator*()
 {
  return *(d->mIt);
 }
 Addressee *AddressBook::Iterator::operator->()
 {
  return &(*(d->mIt));
 }
 AddressBook::Iterator &AddressBook::Iterator::operator++()
 {
  (d->mIt)++;
  return *this;
 }
 AddressBook::Iterator &AddressBook::Iterator::operator++(int)
 {
  (d->mIt)++;
  return *this;
 }
 AddressBook::Iterator &AddressBook::Iterator::operator--()
 {
  (d->mIt)--;
  return *this;
 }
 AddressBook::Iterator &AddressBook::Iterator::operator--(int)
 {
  (d->mIt)--;
  return *this;
 }
 bool AddressBook::Iterator::operator==( const Iterator &it )
 {
  return ( d->mIt == it.d->mIt );
 }
 bool AddressBook::Iterator::operator!=( const Iterator &it )
 {
  return ( d->mIt != it.d->mIt );
 }
 AddressBook::ConstIterator::ConstIterator()
 {
  d = new ConstIteratorData;
 }
 AddressBook::ConstIterator::ConstIterator( const AddressBook::ConstIterator &i )
 {
  d = new ConstIteratorData;
  d->mIt = i.d->mIt;
 }
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator=( const AddressBook::ConstIterator &i )
 {
  if( this  == &i ) return *this; // guard for self assignment
  delete d; // delete the old data because the Iterator was really constructed before
  d = new ConstIteratorData;
  d->mIt = i.d->mIt;
  return *this;
 }
 AddressBook::ConstIterator::~ConstIterator()
 {
  delete d;
 }
 const Addressee &AddressBook::ConstIterator::operator*() const
 {
  return *(d->mIt);
 }
 const Addressee* AddressBook::ConstIterator::operator->() const
 {
  return &(*(d->mIt));
 }
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator++()
 {
  (d->mIt)++;
  return *this;
 }
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator++(int)
 {
  (d->mIt)++;
  return *this;
 }
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator--()
 {
  (d->mIt)--;
  return *this;
 }
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator--(int)
 {
  (d->mIt)--;
  return *this;
 }
 bool AddressBook::ConstIterator::operator==( const ConstIterator &it )
 {
  return ( d->mIt == it.d->mIt );
 }
 bool AddressBook::ConstIterator::operator!=( const ConstIterator &it )
 {
  return ( d->mIt != it.d->mIt );
 }
 AddressBook::AddressBook()
 {
  init(0, "contact");
 }
 AddressBook::AddressBook( const QString &config )
 {
  init(config, "contact");
 }
 AddressBook::AddressBook( const QString &config, const QString &family )
 {
  init(config, family);
 }
 // the default family is "contact"
 void AddressBook::init(const QString &config, const QString &family )
 {
  d = new AddressBookData;
  QString fami = family;
  qDebug("new ab ");
  if (config != 0) {
      qDebug("config != 0 ");
      if ( family == "syncContact" ) {
          qDebug("creating sync config ");
          fami = "contact";
          KConfig* con = new KConfig( locateLocal("config", "syncContactrc") );
          con->setGroup( "General" );
          con->writeEntry( "ResourceKeys", QString("sync") );
          con->writeEntry( "Standard", QString("sync") );
          con->setGroup( "Resource_sync" );
          con->writeEntry( "FileFormat", QString("vcard") );
          con->writeEntry( "FileName", config );
          con->writeEntry( "ResourceIdentifier", QString("sync") );
          con->writeEntry( "ResourceName", QString("sync_res") );
          con->writeEntry( "ResourceType", QString("file") );
          //con->sync();
          d->mConfig = con;
      }
      else
    d->mConfig = new KConfig( locateLocal("config", config) );
 //    qDebug("AddressBook::init 1  config=%s",config.latin1() );
  }
  else {
    d->mConfig = 0;
 //    qDebug("AddressBook::init 1  config=0");
  }
 //US  d->mErrorHandler = 0;
  d->mManager = new KRES::Manager<Resource>( fami, false );
  d->mManager->readConfig( d->mConfig );
  if ( family == "syncContact" ) {
      KRES::Manager<Resource> *manager = d->mManager;
      KRES::Manager<Resource>::ActiveIterator it;
      for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
          (*it)->setAddressBook( this );
          if ( !(*it)->open() )
              error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) );
      }
      Resource *res = standardResource();
      if ( !res ) {
          qDebug("ERROR: no standard resource");
          res = manager->createResource( "file" );
          if ( res )
              {
                  addResource( res );
              }
          else
              qDebug(" No resource available!!!");
      }
      setStandardResource( res );
      manager->writeConfig();
  }
  addCustomField( i18n( "Department" ), KABC::Field::Organization,
                                "X-Department", "KADDRESSBOOK" );
  addCustomField( i18n( "Profession" ), KABC::Field::Organization,
                                "X-Profession", "KADDRESSBOOK" );
  addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization,
                                "X-AssistantsName", "KADDRESSBOOK" );
  addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization,
                                "X-ManagersName", "KADDRESSBOOK" );
  addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal,
                                "X-SpousesName", "KADDRESSBOOK" );
  addCustomField( i18n( "Office" ), KABC::Field::Personal,
                                "X-Office", "KADDRESSBOOK" );
  addCustomField( i18n( "IM Address" ), KABC::Field::Personal,
                                "X-IMAddress", "KADDRESSBOOK" );
  addCustomField( i18n( "Anniversary" ), KABC::Field::Personal,
                                "X-Anniversary", "KADDRESSBOOK" );
  //US added this field to become compatible with Opie/qtopia addressbook
  // values can be "female" or "male" or "". An empty field represents undefined.
  addCustomField( i18n( "Gender" ), KABC::Field::Personal,
                                "X-Gender", "KADDRESSBOOK" );
  addCustomField( i18n( "Children" ), KABC::Field::Personal,
                                "X-Children", "KADDRESSBOOK" );
  addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal,
                                "X-FreeBusyUrl", "KADDRESSBOOK" );
  addCustomField( i18n( "ExternalID" ), KABC::Field::Personal,
                                "X-ExternalID", "KADDRESSBOOK" );
 }
 AddressBook::~AddressBook()
 {
  delete d->mConfig; d->mConfig = 0;
  delete d->mManager; d->mManager = 0;
 //US  delete d->mErrorHandler; d->mErrorHandler = 0;
  delete d; d = 0;
 }
 bool AddressBook::load()
 {
  clear();
  KRES::Manager<Resource>::ActiveIterator it;
  bool ok = true;
  for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
    if ( !(*it)->load() ) {
      error( i18n("Unable to load resource '%1'").arg( (*it)->resourceName() ) );
      ok = false;
    }
  // mark all addressees as unchanged
  Addressee::List::Iterator addrIt;
  for ( addrIt = d->mAddressees.begin(); addrIt != d->mAddressees.end(); ++addrIt )
    (*addrIt).setChanged( false );
  return ok;
 }
 bool AddressBook::save( Ticket *ticket )
 {
  kdDebug(5700) << "AddressBook::save()"<< endl;
  if ( ticket->resource() ) {
    deleteRemovedAddressees();
    return ticket->resource()->save( ticket );
  }
  return false;
 }
 bool AddressBook::saveAB()
 {
  bool ok = true;
  deleteRemovedAddressees();
  KRES::Manager<Resource>::ActiveIterator it;
  KRES::Manager<Resource> *manager = d->mManager;
  for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
    if ( !(*it)->readOnly() && (*it)->isOpen() ) {
      Ticket *ticket = requestSaveTicket( *it );
 //        qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
      if ( !ticket ) {
        error( i18n( "Unable to save to resource '%1'. It is locked." )
                   .arg( (*it)->resourceName() ) );
        return false;
      }
      //if ( !save( ticket ) ) 
      if ( ticket->resource() ) {
          if ( ! ticket->resource()->save( ticket )  )
              ok = false;
      } else 
          ok = false;
          
    }
  }
  return ok;
 }
 AddressBook::Iterator AddressBook::begin()
 {
  Iterator it = Iterator();
  it.d->mIt = d->mAddressees.begin();
  return it;
 }
 AddressBook::ConstIterator AddressBook::begin() const
 {
  ConstIterator it = ConstIterator();
  it.d->mIt = d->mAddressees.begin();
  return it;
 }
 AddressBook::Iterator AddressBook::end()
 {
  Iterator it = Iterator();
  it.d->mIt = d->mAddressees.end();
  return it;
 }
 AddressBook::ConstIterator AddressBook::end() const
 {
  ConstIterator it = ConstIterator();
  it.d->mIt = d->mAddressees.end();
  return it;
 }
 void AddressBook::clear()
 {
  d->mAddressees.clear();
 }
 Ticket *AddressBook::requestSaveTicket( Resource *resource )
 {
  kdDebug(5700) << "AddressBook::requestSaveTicket()" << endl;
  if ( !resource )
  {
    qDebug("AddressBook::requestSaveTicket no resource" );
    resource = standardResource();
  }
  KRES::Manager<Resource>::ActiveIterator it;
  for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
    if ( (*it) == resource ) {
      if ( (*it)->readOnly() || !(*it)->isOpen() )
        return 0;
      else
        return (*it)->requestSaveTicket();
    }
  }
  return 0;
 }
-void AddressBook::insertAddressee( const Addressee &a )
+void AddressBook::insertAddressee( const Addressee &a, bool setRev )
 {
  Addressee::List::Iterator it;
  for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) {
    if ( a.uid() == (*it).uid() ) {
      bool changed = false;
      Addressee addr = a;
      if ( addr != (*it) )
        changed = true;
      (*it) = a;
      if ( (*it).resource() == 0 )
        (*it).setResource( standardResource() );
      if ( changed ) {
-        (*it).setRevision( QDateTime::currentDateTime() );
+          if ( setRev )
+              (*it).setRevision( QDateTime::currentDateTime() ); 
        (*it).setChanged( true );
      }
      return;
    }
  }
  d->mAddressees.append( a );
  Addressee& addr = d->mAddressees.last();
  if ( addr.resource() == 0 )
    addr.setResource( standardResource() );
  addr.setChanged( true );
 }
 void AddressBook::removeAddressee( const Addressee &a )
 {
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( a.uid() == (*it).uid() ) {
      removeAddressee( it );
      return;
    }
  }
 }
 void AddressBook::removeAddressee( const Iterator &it )
 {
  d->mRemovedAddressees.append( (*it) );
  d->mAddressees.remove( it.d->mIt );
 }
 AddressBook::Iterator AddressBook::find( const Addressee &a )
 {
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( a.uid() == (*it).uid() ) {
      return it;
    }
  }
  return end();
 }
 Addressee AddressBook::findByUid( const QString &uid )
 {
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( uid == (*it).uid() ) {
      return *it;
    }
  }
  return Addressee();
 }
 Addressee::List AddressBook::getExternLastSyncAddressees()
 {
    Addressee::List results;
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( (*it).uid().left( 20 ) == "last-syncAddressee-"  ) {
        if ( (*it).familyName().left(3) == "E: " )
            results.append( *it );
    }
  }
  return results;
 }
 void AddressBook::resetTempSyncStat()
 {
    Iterator it;
  for ( it = begin(); it != end(); ++it ) {
      (*it).setTempSyncStat ( SYNC_TEMPSTATE_INITIAL );
  }
 }
 
 QStringList AddressBook:: uidList()
 {
    QStringList results;
    Iterator it;
    for ( it = begin(); it != end(); ++it ) {
        results.append( (*it).uid() );
    }
    return results;
 }
 Addressee::List AddressBook::allAddressees()
 {
  return d->mAddressees;
 }
 Addressee::List AddressBook::findByName( const QString &name )
 {
  Addressee::List results;
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( name == (*it).realName() ) {
      results.append( *it );
    }
  }
  return results;
 }
 Addressee::List AddressBook::findByEmail( const QString &email )
 {
  Addressee::List results;
  QStringList mailList;
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    mailList = (*it).emails();
    for ( QStringList::Iterator ite = mailList.begin(); ite != mailList.end(); ++ite ) {
      if ( email == (*ite) ) {
        results.append( *it );
      }
    }
  }
  return results;
 }
 Addressee::List AddressBook::findByCategory( const QString &category )
 {
  Addressee::List results;
  Iterator it;
  for ( it = begin(); it != end(); ++it ) {
    if ( (*it).hasCategory( category) ) {
      results.append( *it );
    }
  }
  return results;
 }
 void AddressBook::dump() const
 {
  kdDebug(5700) << "AddressBook::dump() --- begin ---" << endl;
  ConstIterator it;
  for( it = begin(); it != end(); ++it ) {
    (*it).dump();
  }
  kdDebug(5700) << "AddressBook::dump() ---  end  ---" << endl;
 }
 QString AddressBook::identifier()
 {
  QStringList identifier;
  KRES::Manager<Resource>::ActiveIterator it;
  for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
    if ( !(*it)->identifier().isEmpty() )
      identifier.append( (*it)->identifier() );
  }
  return identifier.join( ":" );
 }
 Field::List AddressBook::fields( int category )
 {
  if ( d->mAllFields.isEmpty() ) {
    d->mAllFields = Field::allFields();
  }
  if ( category == Field::All ) return d->mAllFields;
  Field::List result;
  Field::List::ConstIterator it;
  for( it = d->mAllFields.begin(); it != d->mAllFields.end(); ++it ) {
    if ( (*it)->category() & category ) result.append( *it );
  }
  return result;
 }
 bool AddressBook::addCustomField( const QString &label, int category,
                                  const QString &key, const QString &app )
 {
  if ( d->mAllFields.isEmpty() ) {
    d->mAllFields = Field::allFields();
  }
 //US  QString a = app.isNull() ? KGlobal::instance()->instanceName() : app;
  QString a = app.isNull() ? KGlobal::getAppName() : app;
  QString k = key.isNull() ? label : key;
  Field *field = Field::createCustomField( label, category, k, a );
  if ( !field ) return false;
  d->mAllFields.append( field );
  return true;
 }
 QDataStream &KABC::operator<<( QDataStream &s, const AddressBook &ab )
 {
  if (!ab.d) return s;
  return s << ab.d->mAddressees;
 }
 QDataStream &KABC::operator>>( QDataStream &s, AddressBook &ab )
 {
  if (!ab.d) return s;
  s >> ab.d->mAddressees;
  return s;
 }
 bool AddressBook::addResource( Resource *resource )
 {
  if ( !resource->open() ) {
    kdDebug(5700) << "AddressBook::addResource(): can't add resource" << endl;
    return false;
  }
  resource->setAddressBook( this );
  d->mManager->add( resource );
  return true;
 }
 bool AddressBook::removeResource( Resource *resource )
 {
  resource->close();
  if ( resource == standardResource() )
    d->mManager->setStandardResource( 0 );
  resource->setAddressBook( 0 );
  d->mManager->remove( resource );
  return true;
 }
 QPtrList<Resource> AddressBook::resources()
 {
  QPtrList<Resource> list;
 //  qDebug("AddressBook::resources() 1");
  KRES::Manager<Resource>::ActiveIterator it;
  for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
    list.append( *it );
  return list;
 }
 /*US
 void AddressBook::setErrorHandler( ErrorHandler *handler )
 {
  delete d->mErrorHandler;
  d->mErrorHandler = handler;
 }
 */
 void AddressBook::error( const QString& msg )
 {
 /*US
  if ( !d->mErrorHandler ) // create default error handler
    d->mErrorHandler = new ConsoleErrorHandler;
  if ( d->mErrorHandler )
    d->mErrorHandler->error( msg );
  else
    kdError(5700) << "no error handler defined" << endl;
 */
    kdDebug(5700) << "msg" << endl;
    qDebug(msg);
 }
 void AddressBook::deleteRemovedAddressees()
 {
  Addressee::List::Iterator it;
  for ( it = d->mRemovedAddressees.begin(); it != d->mRemovedAddressees.end(); ++it ) {
    Resource *resource = (*it).resource();
    if ( resource && !resource->readOnly() && resource->isOpen() )
      resource->removeAddressee( *it );
  }
  d->mRemovedAddressees.clear();
 }
 void AddressBook::setStandardResource( Resource *resource )
 {
 //  qDebug("AddressBook::setStandardResource 1");
  d->mManager->setStandardResource( resource );
 }
 Resource *AddressBook::standardResource()
 {
  return d->mManager->standardResource();
 }
 KRES::Manager<Resource> *AddressBook::resourceManager()
 {
  return d->mManager;
 }
 void AddressBook::cleanUp()
 {
  KRES::Manager<Resource>::ActiveIterator it;
  for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
    if ( !(*it)->readOnly() && (*it)->isOpen() )
      (*it)->cleanUp();
  }
 }
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 650a638..253de68 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -1,334 +1,334 @@
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@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$
 */
 #ifndef KABC_ADDRESSBOOK_H
 #define KABC_ADDRESSBOOK_H
 #include <qobject.h>
 #include <kresources/manager.h>
 #include <qptrlist.h>
 #include "addressee.h"
 #include "field.h"
 namespace KABC {
 class ErrorHandler;
 class Resource;
 class Ticket;
 /**
  @short Address Book
  This class provides access to a collection of address book entries.
 */
 class AddressBook : public QObject
 {
    Q_OBJECT
    friend QDataStream &operator<<( QDataStream &, const AddressBook & );
    friend QDataStream &operator>>( QDataStream &, AddressBook & );
    friend class StdAddressBook;
  public:
    /**
      @short Address Book Iterator
      This class provides an iterator for address book entries.
    */
    class Iterator
    {
      public:
        Iterator();
        Iterator( const Iterator & );
              ~Iterator();
              Iterator &operator=( const Iterator & );
        const Addressee &operator*() const;
        Addressee &operator*();
        Addressee* operator->();
        Iterator &operator++();
        Iterator &operator++(int);
        Iterator &operator--();
        Iterator &operator--(int);
        bool operator==( const Iterator &it );
        bool operator!=( const Iterator &it );
              struct IteratorData;
        IteratorData *d;
    };
    /**
      @short Address Book Const Iterator
      This class provides a const iterator for address book entries.
    */
    class ConstIterator
    {
      public:
        ConstIterator();
        ConstIterator( const ConstIterator & );
              ~ConstIterator();
              ConstIterator &operator=( const ConstIterator & );
        const Addressee &operator*() const;
        const Addressee* operator->() const;
        ConstIterator &operator++();
        ConstIterator &operator++(int);
        ConstIterator &operator--();
        ConstIterator &operator--(int);
        bool operator==( const ConstIterator &it );
        bool operator!=( const ConstIterator &it );
              struct ConstIteratorData;
        ConstIteratorData *d;
    };
    /**
      Constructs a address book object.
      @param format File format class.
    */
    AddressBook();
    AddressBook( const QString &config );
    AddressBook( const QString &config, const QString &family );
    virtual ~AddressBook();
    /**
      Requests a ticket for saving the addressbook. Calling this function locks
      the addressbook for all other processes. If the address book is already
      locked the function returns 0. You need the returned @ref Ticket object
      for calling the @ref save() function.
      @see save()
    */
    Ticket *requestSaveTicket( Resource *resource=0 );
    /**
      Load address book from file.
    */
    bool load();
    /**
      Save address book. The address book is saved to the file, the Ticket
      object has been requested for by @ref requestSaveTicket().
      @param ticket a ticket object returned by @ref requestSaveTicket()
    */
    bool save( Ticket *ticket );
    bool saveAB( );
    /**
      Returns a iterator for first entry of address book.
    */
    Iterator begin();
    /**
      Returns a const iterator for first entry of address book.
    */
    ConstIterator begin() const;
    /**
      Returns a iterator for first entry of address book.
    */
    Iterator end();
    /**
      Returns a const iterator for first entry of address book.
    */
    ConstIterator end() const;
    /**
      Removes all entries from address book.
    */
    void clear();
    /**
      Insert an Addressee object into address book. If an object with the same
      unique id already exists in the address book it it replaced by the new
      one. If not the new object is appended to the address book.
    */
-    void insertAddressee( const Addressee & );
+    void insertAddressee( const Addressee &, bool setRev = true );
    /**
      Removes entry from the address book.
    */
    void removeAddressee( const Addressee & );
    /**
      This is like @ref removeAddressee() just above, with the difference that
      the first element is a iterator, returned by @ref begin().
    */
    void removeAddressee( const Iterator & );
    /**
      Find the specified entry in address book. Returns end(), if the entry
      couldn't be found.
    */
    Iterator find( const Addressee & );
    /**
      Find the entry specified by an unique id. Returns an empty Addressee
      object, if the address book does not contain an entry with this id.
    */
    Addressee findByUid( const QString & );
    /**
      Returns a list of all addressees in the address book. This list can
      be sorted with @ref KABC::AddresseeList for example.
    */
    Addressee::List allAddressees();
    /**
      Find all entries with the specified name in the address book. Returns
      an empty list, if no entries could be found.
    */
    Addressee::List findByName( const QString & );
    /**
      Find all entries with the specified email address  in the address book.
      Returns an empty list, if no entries could be found.
    */
    Addressee::List findByEmail( const QString & );
    /**
      Find all entries wich have the specified category in the address book.
      Returns an empty list, if no entries could be found.
    */
    Addressee::List findByCategory( const QString & );
    /**
      Return a string identifying this addressbook.
    */
    virtual QString identifier();
    /**
      Used for debug output.
    */
    void dump() const;
    void emitAddressBookLocked() { emit addressBookLocked( this ); }
    void emitAddressBookUnlocked() { emit addressBookUnlocked( this ); }
    void emitAddressBookChanged() { emit addressBookChanged( this ); }
    /**
      Return list of all Fields known to the address book which are associated
      with the given field category.
    */
    Field::List fields( int category = Field::All );
    /**
      Add custom field to address book.
      @param label    User visible label of the field.
      @param category Ored list of field categories.
      @param key      Identifier used as key for reading and writing the field.
      @param app      String used as application key for reading and writing
                      the field.
    */
    bool addCustomField( const QString &label, int category = Field::All,
                         const QString &key = QString::null,
                         const QString &app = QString::null );
    /**
      Add address book resource.
    */
    bool addResource( Resource * );
    /**
      Remove address book resource.
    */
    bool removeResource( Resource * );
    /**
      Return pointer list of all resources.
    */
    QPtrList<Resource> resources();
    /**
      Set the @p ErrorHandler, that is used by @ref error() to
      provide gui-independend error messages.
    */
    void setErrorHandler( ErrorHandler * );
    /**
      Shows gui independend error messages.
    */
    void error( const QString& );
    /**
      Query all resources to clean up their lock files
     */
    void cleanUp();
    // sync stuff 
    Addressee::List getExternLastSyncAddressees();
    void resetTempSyncStat(); 
    QStringList uidList(); 
  signals:
    /**
      Emitted, when the address book has changed on disk.
    */
    void addressBookChanged( AddressBook * );
    /**
      Emitted, when the address book has been locked for writing.
    */
    void addressBookLocked( AddressBook * );
    /**
      Emitted, when the address book has been unlocked.
    */
    void addressBookUnlocked( AddressBook * );
  protected:
    void deleteRemovedAddressees();
    void setStandardResource( Resource * );
    Resource *standardResource();
    KRES::Manager<Resource> *resourceManager();
    void init(const QString &config, const QString &family);
  private:
 //US    QPtrList<Resource> mDummy; // Remove in KDE 4
    struct AddressBookData;
    AddressBookData *d;
 };
 QDataStream &operator<<( QDataStream &, const AddressBook & );
 QDataStream &operator>>( QDataStream &, AddressBook & );
 }
 #endif
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index fb32f6e..7f04d8f 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1,479 +1,480 @@
 /*** Warning! This file has been generated by the script makeaddressee ***/
 /*
    This file is part of libkabc.
    Copyright (c) 2001 Cornelius Schumacher <schumacher@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$
 */
 #include <kconfig.h>
 #include <ksharedptr.h>
 #include <kdebug.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kidmanager.h>
 //US
 #include <kstandarddirs.h>
 #include <libkcal/syncdefines.h>
 //US #include "resource.h"
 #include "addressee.h"
 using namespace KABC;
 static bool matchBinaryPattern( int value, int pattern );
 struct Addressee::AddresseeData : public KShared
 {
  QString uid;
  QString name;
  QString formattedName;
  QString familyName;
  QString givenName;
  QString additionalName;
  QString prefix;
  QString suffix;
  QString nickName;
  QDateTime birthday;
  QString mailer;
  TimeZone timeZone;
  Geo geo;
  QString title;
  QString role;
  QString organization;
  QString note;
  QString productId;
  QDateTime revision;
  QString sortString;
  KURL url;
  Secrecy secrecy;
  Picture logo;
  Picture photo;
  Sound sound;
  Agent agent;
  QString mExternalId;
  PhoneNumber::List phoneNumbers;
  Address::List addresses;
  Key::List keys;
  QStringList emails;
  QStringList categories;
  QStringList custom;
  Resource *resource;
  bool empty    :1;
  bool changed  :1;
 };
 Addressee::Addressee()
 {
  mData = new AddresseeData;
  mData->empty = true;
  mData->changed = false;
  mData->resource = 0;
  mData->mExternalId = ":";
+  mData->revision = QDateTime ( QDate( 2004,1,1));
  mTempSyncStat =  SYNC_TEMPSTATE_INITIAL;
 }
 Addressee::~Addressee()
 {
 }
 Addressee::Addressee( const Addressee &a )
 {
  mData = a.mData;
  mTempSyncStat =  SYNC_TEMPSTATE_INITIAL;
 }
 Addressee &Addressee::operator=( const Addressee &a )
 {
  mData = a.mData;
  return (*this);
 }
 Addressee Addressee::copy()
 {
  Addressee a;
  *(a.mData) = *mData;
  return a;
 }
 void Addressee::detach()
 {
  if ( mData.count() == 1 ) return;
  *this = copy();
 }
 bool Addressee::operator==( const Addressee &a ) const
 {
  if ( uid() != a.uid() ) return false;
  if ( mData->name != a.mData->name ) return false;
  if ( mData->formattedName != a.mData->formattedName ) return false;
  if ( mData->familyName != a.mData->familyName ) return false;
  if ( mData->givenName != a.mData->givenName ) return false;
  if ( mData->additionalName != a.mData->additionalName ) return false;
  if ( mData->prefix != a.mData->prefix ) return false;
  if ( mData->suffix != a.mData->suffix ) return false;
  if ( mData->nickName != a.mData->nickName ) return false;
  if ( mData->birthday != a.mData->birthday ) return false;
  if ( mData->mailer != a.mData->mailer ) return false;
  if ( mData->timeZone != a.mData->timeZone ) return false;
  if ( mData->geo != a.mData->geo ) return false;
  if ( mData->title != a.mData->title ) return false;
  if ( mData->role != a.mData->role ) return false;
  if ( mData->organization != a.mData->organization ) return false;
  if ( mData->note != a.mData->note ) return false;
  if ( mData->productId != a.mData->productId ) return false;
  if ( mData->revision != a.mData->revision ) return false;
  if ( mData->sortString != a.mData->sortString ) return false;
  if ( mData->secrecy != a.mData->secrecy ) return false;
  if ( mData->logo != a.mData->logo ) return false;
  if ( mData->photo != a.mData->photo ) return false;
  if ( mData->sound != a.mData->sound ) return false;
  if ( mData->agent != a.mData->agent ) return false;
  if ( ( mData->url.isValid() || a.mData->url.isValid() ) &&
       ( mData->url != a.mData->url ) ) return false;
  if ( mData->phoneNumbers != a.mData->phoneNumbers ) return false;
  if ( mData->addresses != a.mData->addresses ) return false;
  if ( mData->keys != a.mData->keys ) return false;
  if ( mData->emails != a.mData->emails ) return false;
  if ( mData->categories != a.mData->categories ) return false;
  if ( mData->custom != a.mData->custom ) return false;
  return true;
 }
 bool Addressee::operator!=( const Addressee &a ) const
 {
  return !( a == *this );
 }
 bool Addressee::isEmpty() const
 {
  return mData->empty;
 }
 void Addressee::removeID(const QString &prof)
 {
    detach();
    mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof);
    
 }
 void Addressee::setID( const QString & prof , const QString & id )
 {
    detach();
    mData->mExternalId = KIdManager::setId ( mData->mExternalId, prof, id );
 }
 void Addressee::setTempSyncStat( int id )
 {
    mTempSyncStat = id;
 }
 int Addressee::tempSyncStat() const
 {
    return mTempSyncStat;
 }
 QString Addressee::getID( const QString &  prof)
 {
    return KIdManager::getId ( mData->mExternalId, prof ); 
 }
 void Addressee::setCsum( const QString & prof , const QString & id )
 {
    detach();
    mData->mExternalId = KIdManager::setCsum ( mData->mExternalId, prof, id );
 }
 QString Addressee::getCsum( const QString &  prof)
 {
    return KIdManager::getCsum ( mData->mExternalId, prof ); 
 }
 void Addressee::setIDStr( const QString & s )
 { 
    detach();
    mData->mExternalId = s;
 }
 QString Addressee::IDStr() const
 {
    return mData->mExternalId;
 }
 void Addressee::setUid( const QString &id )
 {
  if ( id == mData->uid ) return;
  detach();
  mData->empty = false;
  mData->uid = id;
 }
 QString Addressee::uid() const
 {
  if ( mData->uid.isEmpty() )
    mData->uid = KApplication::randomString( 10 );
  return mData->uid;
 }
 QString Addressee::uidLabel()
 {
  return i18n("Unique Identifier");
 }
 void Addressee::setName( const QString &name )
 {
  if ( name == mData->name ) return;
  detach();
  mData->empty = false;
  mData->name = name;
 }
 QString Addressee::name() const
 {
  return mData->name;
 }
 QString Addressee::nameLabel()
 {
  return i18n("Name");
 }
 void Addressee::setFormattedName( const QString &formattedName )
 {
  if ( formattedName == mData->formattedName ) return;
  detach();
  mData->empty = false;
  mData->formattedName = formattedName;
 }
 QString Addressee::formattedName() const
 {
  return mData->formattedName;
 }
 QString Addressee::formattedNameLabel()
 {
  return i18n("Formatted Name");
 }
 void Addressee::setFamilyName( const QString &familyName )
 {
  if ( familyName == mData->familyName ) return;
  detach();
  mData->empty = false;
  mData->familyName = familyName;
 }
 QString Addressee::familyName() const
 {
  return mData->familyName;
 }
 QString Addressee::familyNameLabel()
 {
  return i18n("Family Name");
 }
 void Addressee::setGivenName( const QString &givenName )
 {
  if ( givenName == mData->givenName ) return;
  detach();
  mData->empty = false;
  mData->givenName = givenName;
 }
 QString Addressee::givenName() const
 {
  return mData->givenName;
 }
 QString Addressee::givenNameLabel()
 {
  return i18n("Given Name");
 }
 void Addressee::setAdditionalName( const QString &additionalName )
 {
  if ( additionalName == mData->additionalName ) return;
  detach();
  mData->empty = false;
  mData->additionalName = additionalName;
 }
 QString Addressee::additionalName() const
 {
  return mData->additionalName;
 }
 QString Addressee::additionalNameLabel()
 {
  return i18n("Additional Names");
 }
 void Addressee::setPrefix( const QString &prefix )
 {
  if ( prefix == mData->prefix ) return;
  detach();
  mData->empty = false;
  mData->prefix = prefix;
 }
 QString Addressee::prefix() const
 {
  return mData->prefix;
 }
 QString Addressee::prefixLabel()
 {
  return i18n("Honorific Prefixes");
 }
 void Addressee::setSuffix( const QString &suffix )
 {
  if ( suffix == mData->suffix ) return;
  detach();
  mData->empty = false;
  mData->suffix = suffix;
 }
 QString Addressee::suffix() const
 {
  return mData->suffix;
 }
 QString Addressee::suffixLabel()
 {
  return i18n("Honorific Suffixes");
 }
 void Addressee::setNickName( const QString &nickName )
 {
  if ( nickName == mData->nickName ) return;
  detach();
  mData->empty = false;
  mData->nickName = nickName;
 }
 QString Addressee::nickName() const
 {
  return mData->nickName;
 }
 QString Addressee::nickNameLabel()
 {
  return i18n("Nick Name");
 }
 void Addressee::setBirthday( const QDateTime &birthday )
 {
  if ( birthday == mData->birthday ) return;
  detach();
  mData->empty = false;
  mData->birthday = birthday;
 }
 QDateTime Addressee::birthday() const
 {
  return mData->birthday;
 }
 QString Addressee::birthdayLabel()
 {
  return i18n("Birthday");
 }
 QString Addressee::homeAddressStreetLabel()
 {
  return i18n("Home Address Street");
 }
 QString Addressee::homeAddressLocalityLabel()
 {
  return i18n("Home Address Locality");
 }
 QString Addressee::homeAddressRegionLabel()
 {
  return i18n("Home Address Region");
 }
 QString Addressee::homeAddressPostalCodeLabel()
 {
  return i18n("Home Address Postal Code");
 }
 QString Addressee::homeAddressCountryLabel()
 {
  return i18n("Home Address Country");
 }
 QString Addressee::homeAddressLabelLabel()
 {
  return i18n("Home Address Label");
 }
 QString Addressee::businessAddressStreetLabel()
 {
  return i18n("Business Address Street");
 }
 QString Addressee::businessAddressLocalityLabel()
 {
  return i18n("Business Address Locality");
 }
 QString Addressee::businessAddressRegionLabel()
 {
  return i18n("Business Address Region");
 }
 QString Addressee::businessAddressPostalCodeLabel()
 {
  return i18n("Business Address Postal Code");
 }
 QString Addressee::businessAddressCountryLabel()
 {
  return i18n("Business Address Country");
 }
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index f497541..226d5e4 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2142,733 +2142,863 @@ void KABCore::fillSyncMenu()
    for ( i = 0; i < prof.count(); ++i ) {
        syncMenu->insertItem(  prof[i], 1000+i );
        if ( i == 2 )
            syncMenu->insertSeparator();
    }
    QDir app_dir;
    if ( !app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
        syncMenu->setItemEnabled( false , 1000 );
    }
    //probaly useless
    //mView->setupExternSyncProfiles();
 }
 void KABCore::slotSyncMenu( int action )
 {
    //qDebug("syncaction %d ", action);
    if ( action == 0 ) {
        // seems to be a Qt2 event handling bug
        // syncmenu.clear causes a segfault at first time
        // when we call it after the main event loop, it is ok
        // same behaviour when calling OM/Pi via QCOP for the first time
        QTimer::singleShot ( 1, this, SLOT ( confSync() ) ); 
        //confSync();
        return;
    }
    if ( action == 1 ) {
        multiSync( true );
        return;
    }
    if (mBlockSaveFlag)
      return;
    mBlockSaveFlag = true;
    mCurrentSyncProfile = action - 1000 ;
    mCurrentSyncDevice = KABPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] ;
    mCurrentSyncName =  KABPrefs::instance()->mLocalMachineName ;
    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
    KSyncProfile* temp = new KSyncProfile ();
    temp->setName(KABPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
    temp->readConfig(&config);
    KABPrefs::instance()->mAskForPreferences = temp->getAskForPreferences();
    KABPrefs::instance()->mSyncAlgoPrefs = temp->getSyncPrefs();
    KABPrefs::instance()->mWriteBackFile = temp->getWriteBackFile();
    KABPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting();
    KABPrefs::instance()->mWriteBackInFuture = 0;
    if ( temp->getWriteBackFuture() )
        KABPrefs::instance()->mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
    KABPrefs::instance()->mShowSyncSummary = temp->getShowSummaryAfterSync();
    if ( action == 1000  ) {
        syncSharp();
    } else if ( action == 1001 ) {
        syncLocalFile();
    } else if ( action == 1002 ) {
        quickSyncLocalFile();
    } else if ( action >= 1003  ) {
        if ( temp->getIsLocalFileSync() ) {
            if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
                KABPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
        } else {
            if (  temp->getIsPhoneSync() ) {
                KABPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ;
                KABPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( );
                KABPrefs::instance()->mPhoneModel = temp->getPhoneModel( );
                syncPhone();
            } else
                syncRemote( temp );
        }
    }
    delete temp;
    mBlockSaveFlag = false;
 }
 void KABCore::syncLocalFile()
 {
    QString fn =KABPrefs::instance()->mLastSyncedLocalFile;
    fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), this );
    if ( fn == "" )
        return;
    if (  syncWithFile(  fn, false ) ) {
        qDebug("syncLocalFile() successful ");
    }
 }
 bool  KABCore::syncWithFile( QString fn , bool quick )
 {
    bool ret = false;
    QFileInfo info;
    info.setFile( fn );
    QString mess;
    bool loadbup = true;
    if ( !info. exists() ) {
        mess =  i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) );
        int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                           mess );
        return ret;
    }
    int result = 0;
    if ( !quick ) {
        mess =  i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
        result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                       mess,
                                       i18n("Sync"), i18n("Cancel"), 0,
                                       0, 1 );
        if ( result )
            return false;
    }
    if ( KABPrefs::instance()->mAskForPreferences )
        edit_sync_options();
    if ( result == 0 ) {
        //qDebug("Now sycing ... ");
        if ( ret = syncAB( fn, KABPrefs::instance()->mSyncAlgoPrefs ) )
            setCaption( i18n("Synchronization successful") );
        else
            setCaption( i18n("Sync cancelled or failed. Nothing synced.") );
        if ( ! quick )
            KABPrefs::instance()->mLastSyncedLocalFile = fn;
        setModified();
    }
    return ret;
 }
 void KABCore::quickSyncLocalFile()
 {
    
    if ( syncWithFile( KABPrefs::instance()->mLastSyncedLocalFile, false ) ) {
        qDebug("quick syncLocalFile() successful ");
      
    }
 }
 void KABCore::multiSync( bool askforPrefs  )
 {
    if (mBlockSaveFlag)
        return;
    mBlockSaveFlag = true;
    QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
    if ( QMessageBox::information( this, i18n("KO/Pi Sync"),
                                   question,
                                   i18n("Yes"), i18n("No"),
                                   0, 0 ) != 0 ) {
        mBlockSaveFlag = false;
        setCaption(i18n("Aborted! Nothing synced!"));
        return;
    }
    mCurrentSyncDevice = i18n("Multiple profiles") ;
    KABPrefs::instance()->mSyncAlgoPrefs = KABPrefs::instance()->mRingSyncAlgoPrefs;
    if ( askforPrefs ) {
        edit_sync_options();
        KABPrefs::instance()->mRingSyncAlgoPrefs = KABPrefs::instance()->mSyncAlgoPrefs;
    }
    setCaption(i18n("Multiple sync started.") );
    qApp->processEvents();
    int num = ringSync() ;
    if (  num > 1 )
        ringSync();
    mBlockSaveFlag = false;
    if ( num )
        save();
    if ( num )
        setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) );
    else
        setCaption(i18n("Nothing synced! No profiles defined for multisync!"));
    return;
 }
 int KABCore::ringSync()
 {
    int syncedProfiles = 0;
    int i;
    QTime timer;
    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
    QStringList syncProfileNames = KABPrefs::instance()->mSyncProfileNames;
    KSyncProfile* temp = new KSyncProfile ();
    KABPrefs::instance()->mAskForPreferences = false;
    for ( i = 0; i < syncProfileNames.count(); ++i ) {
        mCurrentSyncProfile = i;
        temp->setName(syncProfileNames[mCurrentSyncProfile]);
        temp->readConfig(&config);
        if ( temp->getIncludeInRingSyncAB() && ( i < 1 || i > 2  )) {
            setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
            ++syncedProfiles;
            // KABPrefs::instance()->mAskForPreferences = temp->getAskForPreferences();
            KABPrefs::instance()->mWriteBackFile = temp->getWriteBackFile();
            KABPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting();
            KABPrefs::instance()->mWriteBackInFuture = 0;
            if ( temp->getWriteBackFuture() )
                KABPrefs::instance()->mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
            KABPrefs::instance()->mShowSyncSummary = false;
            mCurrentSyncDevice = syncProfileNames[i] ;
            mCurrentSyncName = KABPrefs::instance()->mLocalMachineName;
            if ( i == 0 ) {
                syncSharp();
            } else {
                if ( temp->getIsLocalFileSync() ) {
                    if ( syncWithFile( temp->getRemoteFileNameAB( ), true ) )
                        KABPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
                } else {
                    if (  temp->getIsPhoneSync() ) {
                        KABPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ;
                        KABPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( );
                        KABPrefs::instance()->mPhoneModel = temp->getPhoneModel( );
                        syncPhone();
                    } else
                        syncRemote( temp, false );
                }
            }
            timer.start();
            setCaption(i18n("Multiple sync in progress ... please wait!") );
            while ( timer.elapsed () < 2000 ) {
                qApp->processEvents();
 #ifndef _WIN32_
                sleep (1);
 #endif
            }
        }
    }
    delete temp;
    return syncedProfiles;
 }
 void KABCore::syncRemote( KSyncProfile* prof,  bool ask)
 {
    QString question;
    if ( ask ) {
    question = i18n("Do you really want\nto remote sync\nwith profile \n")+ prof->getName()+" ?\n";
    if ( QMessageBox::information( this, i18n("KO/Pi Sync"),
                                   question,
                                   i18n("Yes"), i18n("No"),
                                   0, 0 ) != 0 )
        return;
    }
    QString command = prof->getPreSyncCommandAB();
    int fi;
    if ( (fi = command.find("$PWD$")) > 0 ) {
        QString pwd = getPassword();
        command = command.left( fi )+ pwd + command.mid( fi+5 );
    }
    int maxlen = 30;
    if ( QApplication::desktop()->width() > 320 )
        maxlen += 25;
    setCaption ( i18n( "Copy remote file to local machine..." ) );
    int fileSize = 0;
    int result = system ( command );
    // 0 : okay
    // 256: no such file or dir
    //
    qDebug("KO: Remote copy result(0 = okay): %d ",result );
    if ( result != 0 ) {
        int len = maxlen;
        while ( len <  command.length() ) {
            command.insert( len , "\n" );
            len += maxlen +2;
        }
        question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ;
        QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"),
                                  question,
                                  i18n("Okay!")) ;
        setCaption ("KO/Pi");
        return;
    }
    setCaption ( i18n( "Copying succeed." ) );
    //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() );
    if ( syncWithFile( prof->getLocalTempFileAB(), true ) ) {
 //         Event* e = mView->getLastSyncEvent();
 //         e->setReadOnly( false );
 //         e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
 //         e->setReadOnly( true );
        if ( KABPrefs::instance()->mWriteBackFile ) {
            command =  prof->getPostSyncCommandAB(); 
            int fi;
            if ( (fi = command.find("$PWD$")) > 0 ) {
                QString pwd = getPassword();
                command = command.left( fi )+ pwd + command.mid( fi+5 );
                
            }
            setCaption ( i18n( "Writing back file ..." ) );
            result = system ( command );
            qDebug("KO: Writing back file result: %d ", result);
            if ( result != 0 ) {
                setCaption ( i18n( "Writing back file result: " )+QString::number( result ) );
                return;
            } else {
                setCaption ( i18n( "Syncronization sucessfully completed" ) );
            }
        }
    }
    return;
 }
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
 void KABCore::edit_sync_options()
 {
    //mDialogManager->showSyncOptions();
    //KABPrefs::instance()->mSyncAlgoPrefs 
    QDialog dia( this, "dia", true );
    dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice );
    QButtonGroup gr ( 1,  Qt::Horizontal, i18n("Sync preferences"), &dia);
    QVBoxLayout lay ( &dia );
    lay.setSpacing( 2 );
    lay.setMargin( 3 );
    lay.addWidget(&gr);
    QRadioButton loc ( i18n("Take local entry on conflict"), &gr );
    QRadioButton rem ( i18n("Take remote entry on conflict"), &gr );
    QRadioButton newest( i18n("Take newest entry on conflict"), &gr );
    QRadioButton ask( i18n("Ask for every entry on conflict"), &gr );
    QRadioButton f_loc( i18n("Force: Take local entry always"), &gr );
    QRadioButton f_rem( i18n("Force: Take remote entry always"), &gr );
    //QRadioButton both( i18n("Take both on conflict"), &gr );
    QPushButton pb ( "OK",  &dia); 
    lay.addWidget( &pb );
    connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); 
    switch ( KABPrefs::instance()->mSyncAlgoPrefs ) {
    case 0:
        loc.setChecked( true);
        break;
    case 1:
        rem.setChecked( true );
        break;
    case 2:
        newest.setChecked( true);
        break;
    case 3:
        ask.setChecked( true);
        break;
    case 4:
        f_loc.setChecked( true);
        break;
    case 5:
        f_rem.setChecked( true);
        break;
    case 6:
        // both.setChecked( true);
        break; 
    default:
        break;
    }
    if ( dia.exec() ) {
        KABPrefs::instance()->mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+  ask.isChecked()*3+  f_loc.isChecked()*4+  f_rem.isChecked()*5;//+  both.isChecked()*6 ;
    }
   
 }
 QString  KABCore::getPassword( )
 {
    QString retfile = "";
    QDialog dia ( this, "input-dialog", true );
    QLineEdit lab ( &dia );
    lab.setEchoMode( QLineEdit::Password );
    QVBoxLayout lay( &dia );
    lay.setMargin(7);
    lay.setSpacing(7);
    lay.addWidget( &lab);
    dia.setFixedSize( 230,50 );
    dia.setCaption( i18n("Enter password") );
    QPushButton pb ( "OK",  &dia);
    lay.addWidget( &pb );
    connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
    dia.show();
    int res = dia.exec();
    if ( res )
        retfile = lab.text();
    dia.hide();
    qApp->processEvents();
    return retfile;
 }
 #include <libkcal/syncdefines.h>
 KABC::Addressee KABCore::getLastSyncAddressee()
 {
    Addressee lse; 
    //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() );
    lse =   mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice );
    if (lse.isEmpty()) {
-        lse.setUid( "last-syncEvent-"+mCurrentSyncDevice ); 
+        qDebug("Creating new last-syncAddressee ");
+        lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); 
        QString sum = "";
        if ( KABPrefs::instance()->mExternSyncProfiles.contains( mCurrentSyncDevice ) )
            sum = "E: ";
        lse.setFamilyName(sum+mCurrentSyncDevice + i18n(" - sync event"));
        lse.setRevision( mLastAddressbookSync );
        lse.setCategories( i18n("SyncEvent") );
        mAddressBook->insertAddressee( lse );
    }
    return lse;
 }
+int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full )
+{
+ 
+    //void setZaurusId(int id);
+    // int zaurusId() const;
+    //  void setZaurusUid(int id);
+   // int zaurusUid() const;
+   // void setZaurusStat(int id);
+   // int zaurusStat() const;
+    // 0 equal
+    // 1 take local
+    // 2 take remote
+    // 3 cancel 
+    QDateTime lastSync = mLastAddressbookSync;
+    if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
+        bool remCh, locCh;
+        remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
+        //if ( remCh )        
+            //qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
+        locCh = ( local->revision() > mLastAddressbookSync );
+        if ( !remCh && ! locCh ) {
+            //qDebug("both not changed ");
+            lastSync = local->revision().addDays(1);
+        } else {
+            if ( locCh ) {
+                //qDebug("loc changed %d %s %s", local->revision() , local->lastModified().toString().latin1(), mLastCalendarSync.toString().latin1());
+                lastSync = local->revision().addDays( -1 );
+                if ( !remCh )
+                    remote->setRevision( lastSync.addDays( -1 ) );
+            } else {
+                //qDebug(" not loc changed ");
+                lastSync = local->revision().addDays( 1 );
+                if ( remCh )
+                    remote->setRevision( lastSync.addDays( 1 ) );
+                
+            }
+        }
+        full = true;  
+        if ( mode < SYNC_PREF_ASK )
+            mode = SYNC_PREF_ASK;
+    } else {
+          if ( local->revision() == remote->revision() )
+                return 0;
+        
+    }
+    // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() );
+    //qDebug("%s %d  %s %d", local->lastModified().toString().latin1() , local->revision(), remote->lastModified().toString().latin1(), remote->revision());  
+    //qDebug("%d %d %d %d ", local->lastModified().time().second(), local->lastModified().time().msec(),  remote->lastModified().time().second(), remote->lastModified().time().msec() );
+    //full = true; //debug only
+    if ( full ) {
+        bool equ = ( (*local) == (*remote) );
+        if ( equ ) {
+            //qDebug("equal ");
+            if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
+                local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) );
+            }
+            if ( mode < SYNC_PREF_FORCE_LOCAL )
+                return 0;
+              
+        }//else //debug only
+        //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1());
+    }
+    int result;
+    bool localIsNew;
+    //qDebug("%s -- %s mLastCalendarSync %s lastsync %s --- local %s remote %s ",local->summary().latin1(), remote->summary().latin1(),mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1()  ,  local->lastModified().toString().latin1() , remote->lastModified().toString().latin1()  );
+    if ( full && mode < SYNC_PREF_NEWEST )
+        mode = SYNC_PREF_ASK;
+    switch( mode ) {
+    case SYNC_PREF_LOCAL:
+        if ( lastSync > remote->revision() )
+            return 1;
+        if ( lastSync > local->revision() )
+            return 2;
+        return 1;
+        break;
+    case SYNC_PREF_REMOTE:
+        if ( lastSync > remote->revision() )
+            return 1;
+        if ( lastSync > local->revision() )
+            return 2;
+        return 2;
+        break;
+    case SYNC_PREF_NEWEST:
+        if ( local->revision() > remote->revision() )
+            return 1;
+        else
+            return 2;
+        break;
+    case SYNC_PREF_ASK: 
+        qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), local->revision().toString().latin1(), remote->revision().toString().latin1()  );
+        if ( lastSync > remote->revision() )
+            return 1;
+        if ( lastSync > local->revision() )
+            return 2;
+        //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), local->revision().toString().latin1(), remote->revision().toString().latin1()  );
+        localIsNew = local->revision() >= remote->revision();
+#if 0
+        if ( localIsNew )
+            getEventViewerDialog()->setColorMode( 1 );
+         else 
+            getEventViewerDialog()->setColorMode( 2 );
+        getEventViewerDialog()->setIncidence(local);
+        if ( localIsNew )
+            getEventViewerDialog()->setColorMode( 2 );
+         else 
+            getEventViewerDialog()->setColorMode( 1 );
+        getEventViewerDialog()->addIncidence(remote);
+        getEventViewerDialog()->setColorMode( 0 );
+        //qDebug("local %d remote %d ",local->relatedTo(),remote->relatedTo()  );
+        getEventViewerDialog()->setCaption( mCurrentSyncDevice +i18n(" : Conflict! Please choose entry!"));
+        getEventViewerDialog()->showMe();
+        result = getEventViewerDialog()->executeS( localIsNew );
+#endif
+        qDebug("conflict! ************************************** ");
+        result = 1;
+        return result;
+          
+        break;
+    case SYNC_PREF_FORCE_LOCAL:
+        return 1;
+        break;
+    case SYNC_PREF_FORCE_REMOTE:
+        return 2;
+        break;
+       
+    default:
+        // SYNC_PREF_TAKE_BOTH not implemented
+        break;
+    }
+    return 0;
+}
 bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode)
 {
    bool syncOK = true;
    int addedAddressee = 0;
    int addedAddresseeR = 0;
    int deletedAddresseeR = 0;
    int deletedAddresseeL = 0;
    int changedLocal = 0;
    int changedRemote = 0;
    //QPtrList<Addressee> el = local->rawAddressees(); 
    Addressee addresseeR;
    QString uid;
    int take;
    Addressee addresseeL;
    Addressee addresseeRSync;
    Addressee addresseeLSync;
    KABC::Addressee::List  addresseeRSyncSharp = remote->getExternLastSyncAddressees();
    KABC::Addressee::List  addresseeLSyncSharp = local->getExternLastSyncAddressees();
    bool fullDateRange = false;
    local->resetTempSyncStat();
    mLastAddressbookSync = QDateTime::currentDateTime();
    QDateTime modifiedCalendar = mLastAddressbookSync;;
    addresseeLSync = getLastSyncAddressee();
+    qDebug("Last Sync %s ", addresseeLSync.revision().toString().latin1());
    addresseeR = remote->findByUid("last-syncAddressee-"+mCurrentSyncName );
    if ( !addresseeR.isEmpty() ) {
        addresseeRSync = addresseeR;
        remote->removeAddressee(addresseeR );
    } else {
        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
            addresseeRSync = addresseeLSync         ;
        } else {
+            qDebug("FULLDATE 1");
            fullDateRange = true;
            Addressee newAdd;
            addresseeRSync = newAdd;
            addresseeRSync.setFamilyName(mCurrentSyncName + i18n(" - sync addressee"));
            addresseeRSync.setUid("last-syncAddressee-"+mCurrentSyncName ); 
            addresseeRSync.setRevision( mLastAddressbookSync );
            addresseeRSync.setCategories( i18n("SyncAddressee") );
        }
    }
-    if ( addresseeLSync.revision() == mLastAddressbookSync )
+    if ( addresseeLSync.revision() == mLastAddressbookSync ) {
+            qDebug("FULLDATE 2");
        fullDateRange = true;
+    }
    if ( ! fullDateRange  ) {
        if ( addresseeLSync.revision() != addresseeRSync.revision() ) {
            
            // qDebug("set fulldate to true %s %s" ,addresseeLSync->dtStart().toString().latin1(), addresseeRSync->dtStart().toString().latin1() ); 
            //qDebug("%d %d %d %d ", addresseeLSync->dtStart().time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec());
            fullDateRange = true;
+            qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() );
        } 
    }
    if ( fullDateRange )
        mLastAddressbookSync = QDateTime::currentDateTime().addDays( -100*365);
    else
        mLastAddressbookSync = addresseeLSync.revision();
    // for resyncing if own file has changed
    // PENDING fixme later when implemented
 #if 0
    if ( mCurrentSyncDevice == "deleteaftersync" ) {
        mLastAddressbookSync = loadedFileVersion;
        qDebug("setting mLastAddressbookSync ");
    }
 #endif
    //qDebug("*************************** ");
    qDebug("mLastAddressbookSync %s ",mLastAddressbookSync.toString().latin1() );
    QStringList er = remote->uidList(); 
    Addressee inR ;//= er.first();
    Addressee  inL;
    QProgressBar bar( er.count(),0 );
    bar.setCaption (i18n("Syncing - close to abort!") );
    
    int w = 300;
    if ( QApplication::desktop()->width() < 320 )
        w = 220;
    int h = bar.sizeHint().height() ;
    int dw = QApplication::desktop()->width();
    int dh = QApplication::desktop()->height();
    bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
    bar.show();
    int modulo = (er.count()/10)+1;
    int incCounter = 0;
    while ( incCounter < er.count()) {
        if ( ! bar.isVisible() )
            return false;
        if ( incCounter % modulo == 0 )
            bar.setProgress( incCounter );
        uid = er[ incCounter ]; 
        bool skipIncidence = false;
        if ( uid.left(20) == QString("last-syncAddressee-") )
            skipIncidence = true;
        QString idS;
        qApp->processEvents();
        if ( !skipIncidence ) {
            inL = local->findByUid( uid );
            inR = remote->findByUid( uid );
            //inL.setResource( 0 );
            //inR.setResource( 0 );
            if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars
-                // pending if ( (take = takeAddressee( inL, inR, mode, fullDateRange )) > 0 ) {
+                if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) {
-                if ( true ) {
                    //qDebug("take %d %s ", take, inL.summary().latin1());
                    if ( take == 3 )
                        return false;
                    if ( take == 1  ) {// take local
                        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                            inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
-                            local->insertAddressee(  inL );
+                            local->insertAddressee(  inL, false );
                        }
                        else
                            idS = inR.IDStr();
                        remote->removeAddressee( inR );
                        inR = inL;
                        inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                        if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL )
                            inR.setIDStr( idS );
                        inR.setResource( 0 );
-                        remote->insertAddressee(  inR );
+                        remote->insertAddressee(  inR , false);
                        ++changedRemote;
                    } else {
                        idS = inL.IDStr();
                        local->removeAddressee( inL );
                        inL = inR;
                        inL.setIDStr( idS );
                        inL.setResource( 0 );
-                        local->insertAddressee(  inL  );
+                        local->insertAddressee(  inL , false );
                        ++changedLocal;
                    }
                }
            } else { //  no conflict
                if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                    QString des = addresseeLSync.note(); 
                    QString pref = "a";
                    if ( des.find(pref+ inR.getID(mCurrentSyncDevice)  +"," ) >= 0 && mode != 5) { // delete it
                        inR.setTempSyncStat( SYNC_TEMPSTATE_DELETE );
                        ++deletedAddresseeR; 
                    } else {
                        inR.setRevision( modifiedCalendar );
-                        remote->insertAddressee( inR );
+                        remote->insertAddressee( inR, false );
                        inL = inR;
                        inL.setResource( 0 );
-                        local->insertAddressee( inL );
+                        local->insertAddressee( inL , false);
                        ++addedAddressee;
                    }
                } else {
                    if ( inR.revision() > mLastAddressbookSync || mode == 5 ) {
                        inR.setRevision( modifiedCalendar );
-                        remote->insertAddressee( inR );
+                        remote->insertAddressee( inR, false );
                        inR.setResource( 0 );
-                        local->insertAddressee( inR );
+                        local->insertAddressee( inR, false );
                        ++addedAddressee;
                    } else {
                        // pending checkExternSyncAddressee(addresseeRSyncSharp, inR);
                        remote->removeAddressee( inR );
                        ++deletedAddresseeR; 
                    }
                }
            }
        }
        ++incCounter;
    }
    er.clear();
    QStringList el = remote->uidList(); 
    modulo = (el.count()/10)+1;
    bar.setCaption (i18n("Add / remove addressees") ); 
    bar.setTotalSteps (  el.count()  ) ;
    bar.show();
    incCounter = 0;
    while ( incCounter < el.count()) {
           
        qApp->processEvents();
        if ( ! bar.isVisible() )
            return false;
        if ( incCounter % modulo == 0 )
            bar.setProgress( incCounter );
        uid = el[ incCounter ]; 
        bool skipIncidence = false;
        if ( uid.left(20) == QString("last-syncAddressee-") )
            skipIncidence = true;
        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL  )
            skipIncidence = true;
        if ( !skipIncidence )  {
            inL = local->findByUid( uid );
            inR = remote->findByUid( uid );
            if ( inR.isEmpty() ) { 
                if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                    if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
                        // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                        local->removeAddressee( inL );
                        ++deletedAddresseeL; 
                    } else {
                        if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) {
                            inL.removeID(mCurrentSyncDevice );
                            ++addedAddresseeR; 
                            //qDebug("remote added Incidence %s ", inL.summary().latin1());
                            inL.setRevision( modifiedCalendar );
-                            local->insertAddressee( inL );
+                            local->insertAddressee( inL, false );
                            inR = inL;
                            inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                            inR.setResource( 0 );
-                            remote->insertAddressee( inR );
+                            remote->insertAddressee( inR, false );
                        }
                    }
                } else {
                    if ( inL.revision() < mLastAddressbookSync && mode != 4 ) {
                        // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                        local->removeAddressee( inL );
                        ++deletedAddresseeL; 
                    } else {
                        if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) {
                            ++addedAddresseeR; 
                            inL.setRevision( modifiedCalendar );
-                            local->insertAddressee( inL );
+                            local->insertAddressee( inL, false );
                            inR = inL;
                            inR.setResource( 0 );
-                            remote->insertAddressee( inR );
+                            remote->insertAddressee( inR, false );
                        }
                    }
                }
            }
        }
        ++incCounter;
    }
    el.clear();
-    int delFut = 0;
- #if 0  
+ 
    
    bar.hide();
    mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 );
    addresseeLSync.setRevision( mLastAddressbookSync );
    addresseeRSync.setRevision( mLastAddressbookSync );
-    addresseeRSync.setLocation( i18n("Remote from: ")+mCurrentSyncName ) ;
+    addresseeRSync.setGivenName( i18n("Remote from: ")+mCurrentSyncName ) ;
-    addresseeLSync.setLocation(i18n("Local from: ") + mCurrentSyncName  );
+    addresseeLSync.setGivenName(i18n("Local from: ") + mCurrentSyncName  );
-    addresseeLSync.setReadOnly( true );
    if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL)
-        remote->addAddressee( addresseeRSync );
+        remote->insertAddressee( addresseeRSync, false );
+    local->insertAddressee( addresseeLSync, false );
    QString mes;
    mes .sprintf(  i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); 
-    QString delmess;
+    if ( KABPrefs::instance()->mShowSyncSummary ) {
-    if ( delFut  ) {
-        delmess.sprintf(  i18n("%d items skipped on remote,\nbecause they are in the past or\nmore than %d weeks in the future.\n"),delFut, KOPrefs::instance()->mWriteBackInFuture ); 
-        mes += delmess;
-    }
-    if ( KOPrefs::instance()->mShowSyncSummary ) {
        KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") );
    }
    qDebug( mes );
-    mCalendar->checkAlarmForIncidence( 0, true );
    return syncOK;
-#endif
-    return false;
 }
 bool KABCore::syncAB(QString filename, int mode)
 {
    //pending prepare addresseeview for output
    //pending detect, if remote file has REV field. if not switch to external sync
    mGlobalSyncMode = SYNC_MODE_NORMAL;
    AddressBook abLocal(filename,"syncContact");
    bool syncOK = false;
    if ( abLocal.load() ) {
        qDebug("AB loaded %s mode %d",filename.latin1(), mode );
        AddressBook::Iterator it;
-        QStringList vcards;
+        //QStringList vcards;
-        for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
+        //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
-            qDebug("Name %s ", (*it).familyName().latin1());
+        //  qDebug("Name %s ", (*it).familyName().latin1());
-        }
+        //}
        syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode );
        if (  syncOK ) {
            if ( KABPrefs::instance()->mWriteBackFile )
                {
                    qDebug("saving remote AB ");
                    abLocal.saveAB();
                }
        }
        setModified();
        
    }
    if ( syncOK )
        mViewManager->refreshView();
    return syncOK;
 #if 0
    if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) {
        getEventViewerDialog()->setSyncMode( true );
        syncOK = synchronizeCalendar( mCalendar, calendar, mode );
        getEventViewerDialog()->setSyncMode( false );
        if (  syncOK ) {
           if ( KOPrefs::instance()->mWriteBackFile )
            {
                storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
                storage->save();
            }
        }
        setModified();
    }
  
 #endif
 }
 void KABCore::confSync()
 { 
    static KSyncPrefsDialog* sp = 0;
    if ( ! sp ) {
        sp = new KSyncPrefsDialog( this, "syncprefs", true );
    }
    sp->usrReadConfig();
 #ifndef DESKTOP_VERSION
    sp->showMaximized();
 #else
    sp->show();
 #endif
    sp->exec();
    KABPrefs::instance()->mSyncProfileNames = sp->getSyncProfileNames();
    KABPrefs::instance()->mLocalMachineName = sp->getLocalMachineName ();
    fillSyncMenu();
 }
 void KABCore::syncSharp()
 {
    if (  mModified  )
        save();
    qDebug("pending syncSharp() ");
    //mView->syncSharp();
    setModified();
 }
 void KABCore::syncPhone()
 {
    if ( mModified  )
        save();
    qDebug("pending syncPhone(); ");
    //mView->syncPhone();
    setModified();
 }
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index c67cee6..f01f306 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -93,391 +93,392 @@ class KABCore : public QWidget
    /**
      Saves the global settings.
     */
    void saveSettings();
    /**
      Returns a pointer to the StdAddressBook of the application.
     */
    KABC::AddressBook *addressBook() const;
    /**
      Returns a pointer to the KConfig object of the application.
     */
    static KConfig *config();
    /**
      Returns a pointer to the global KActionCollection object. So
      other classes can register their actions easily.
     */
    KActionCollection *actionCollection() const;
    /**
      Returns the current search field of the Incremental Search Widget.
     */
    KABC::Field *currentSearchField() const;
    /**
      Returns the uid list of the currently selected contacts.
     */
    QStringList selectedUIDs() const;
    /**
      Displays the ResourceSelectDialog and returns the selected
      resource or a null pointer if no resource was selected by
      the user.
     */
    KABC::Resource *requestResource( QWidget *parent );
 #ifndef KAB_EMBEDDED
    static KAboutData *createAboutData();
 #endif //KAB_EMBEDDED
 #ifdef KAB_EMBEDDED
    inline QPopupMenu* getImportMenu() { return ImportMenu;}
    inline QPopupMenu* getExportMenu() { return ExportMenu;}
 #endif //KAB_EMBEDDED
  public slots:
 #ifdef KAB_EMBEDDED
    void createAboutData();
 #endif //KAB_EMBEDDED
    void statusMessage(QString, int time = 0 );
    void showLicence();
    void faq();
    /**
      Is called whenever a contact is selected in the view.
     */
    void setContactSelected( const QString &uid );
    /**
      Opens the preferred mail composer with all selected contacts as
      arguments.
     */
    void sendMail();
    /**
      Opens the preferred mail composer with the given contacts as
      arguments.
     */
    void sendMail( const QString& email );
    void mailVCard();
    void mailVCard(const QStringList& uids);
    /**
      Beams the "WhoAmI contact.
     */
    void beamMySelf();
    void beamVCard();
    void beamVCard(const QStringList& uids);
    void beamDone( Ir *ir );
    /**
      Starts the preferred web browser with the given URL as argument.
     */
    void browse( const QString& url );
    /**
      Select all contacts in the view.
     */
    void selectAllContacts();
    /**
      Deletes all selected contacts from the address book.
     */
    void deleteContacts();
    /**
      Deletes given contacts from the address book.
      @param uids The uids of the contacts, which shall be deleted.
     */
    void deleteContacts( const QStringList &uids );
    /**
      Copys the selected contacts into clipboard for later pasting.
     */
    void copyContacts();
    /**
      Cuts the selected contacts and stores them for later pasting.
     */
    void cutContacts();
    /**
      Paste contacts from clipboard into the address book.
     */
    void pasteContacts();
    /**
      Paste given contacts into the address book.
      @param list The list of addressee, which shall be pasted.
     */
    void pasteContacts( KABC::Addressee::List &list );
    /**
      Sets the whoAmI contact, that is used by many other programs to
      get personal information about the current user.
     */
    void setWhoAmI();
    /**
      Displays the category dialog and applies the result to all
      selected contacts.
     */
    void setCategories();
    /**
      Sets the field list of the Incremental Search Widget.
     */
    void setSearchFields( const KABC::Field::List &fields );
    /**
      Search with the current search field for a contact, that matches
      the given text, and selects it in the view.
     */
    void incrementalSearch( const QString& text );
    /**
      Marks the address book as modified.
     */
    void setModified();
    /**
      Marks the address book as modified without refreshing the view.
     */
    void setModifiedWOrefresh();
    /**
      Marks the address book as modified concerning the argument.
     */
    void setModified( bool modified );
    /**
      Returns whether the address book is modified.
     */
    bool modified() const;
    /**
      Called whenever an contact is modified in the contact editor
      dialog or the quick edit.
     */
    void contactModified( const KABC::Addressee &addr );
    /**
      DCOP METHODS.
     */
    void addEmail( QString addr );
    void importVCard( const KURL& url, bool showPreview );
    void importVCard( const QString& vCard, bool showPreview );
    void newContact();
    QString getNameByPhone( const QString& phone );
    /**
      END DCOP METHODS
     */
    /**
      Saves the contents of the AddressBook back to disk.
     */
    void save();
    /**
      Undos the last command using the undo stack.
     */
    void undo();
    /**
      Redos the last command that was undone, using the redo stack.
     */
    void redo();
    /**
      Shows the edit dialog for the given uid. If the uid is QString::null,
      the method will try to find a selected addressee in the view.
     */
    void editContact( const QString &uid /*US = QString::null*/ );
 //US added a second method without defaultparameter
    void editContact2();
    /**
      Shows or edits the detail view for the given uid. If the uid is QString::null,
      the method will try to find a selected addressee in the view.
     */
    void executeContact( const QString &uid /*US = QString::null*/ );
    /**
      Launches the configuration dialog.
     */
    void openConfigDialog();
    /**
      Launches the ldap search dialog.
     */
    void openLDAPDialog();
    /**
      Creates a KAddressBookPrinter, which will display the print
      dialog and do the printing.
     */
    void print();
    /**
      Registers a new GUI client, so plugins can register its actions.
     */
   void addGUIClient( KXMLGUIClient *client );
   void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid);
   void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid);
  signals:
    void contactSelected( const QString &name );
    void contactSelected( const QPixmap &pixmap );
  public slots:
    void setDetailsVisible( bool visible );
    void setDetailsToState();
    void slotSyncMenu( int );
  private slots:
    void setJumpButtonBarVisible( bool visible );
  void importFromOL();
    void extensionModified( const KABC::Addressee::List &list );
    void extensionChanged( int id );
    void clipboardDataChanged();
    void updateActionMenu();
    void configureKeyBindings();
    void removeVoice();
 #ifdef KAB_EMBEDDED
    void configureResources();
 #endif //KAB_EMBEDDED
    void slotEditorDestroyed( const QString &uid );
    void configurationChanged();
    void addressBookChanged();
  private:
    void initGUI();
    void initActions();
    AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent,
                                                        const char *name = 0 );
 KXMLGUIClient *mGUIClient;
  KABC::AddressBook *mAddressBook;
  ViewManager *mViewManager;
  // QSplitter *mDetailsSplitter;
  KDGanttMinimizeSplitter *mExtensionBarSplitter;
  ViewContainer *mDetails;
  KDGanttMinimizeSplitter* mMiniSplitter;
  XXPortManager *mXXPortManager;
  JumpButtonBar *mJumpButtonBar;
  IncSearchWidget *mIncSearchWidget;
  ExtensionManager *mExtensionManager;
  KCMultiDialog *mConfigureDialog;
 #ifndef KAB_EMBEDDED
    LDAPSearchDialog *mLdapSearchDialog;
 #endif //KAB_EMBEDDED
    // QDict<AddresseeEditorDialog> mEditorDict;
    AddresseeEditorDialog *mEditorDialog;
    bool mReadWrite;
    bool mModified;
    bool mIsPart;
    bool mMultipleViewsAtOnce;
    //US file menu
    KAction *mActionMail;
    KAction *mActionBeam;
    KAction* mActionPrint;
    KAction* mActionNewContact;
    KAction *mActionSave;
    KAction *mActionEditAddressee;
    KAction *mActionMailVCard;
    KAction *mActionBeamVCard;
    KAction *mActionQuit;
    //US edit menu
    KAction *mActionCopy;
    KAction *mActionCut;
    KAction *mActionPaste;
    KAction *mActionSelectAll;
    KAction *mActionUndo;
    KAction *mActionRedo;
    KAction *mActionDelete;
    //US settings menu
    KAction *mActionConfigResources;
    KAction *mActionConfigKAddressbook;
    KAction *mActionConfigShortcuts;
    KAction *mActionConfigureToolbars;
    KAction *mActionKeyBindings;
    KToggleAction *mActionJumpBar;
    KToggleAction *mActionDetails;
    KAction *mActionWhoAmI;
    KAction *mActionCategories;
    KAction *mActionAboutKAddressbook;
    KAction *mActionLicence;
    KAction *mActionFaq;
    KAction *mActionDeleteView;
    QPopupMenu *viewMenu;
    QPopupMenu *filterMenu;
    QPopupMenu *settingsMenu;
    QPopupMenu *changeMenu;
 //US    QAction *mActionSave;
    QPopupMenu *ImportMenu;
    QPopupMenu *ExportMenu;
    //LR additional methods
    KAction *mActionRemoveVoice;
    KAction * mActionImportOL;
 #ifndef KAB_EMBEDDED
    KAddressBookService *mAddressBookService;
 #endif //KAB_EMBEDDED
    class KABCorePrivate;
    KABCorePrivate *d;
    bool mBlockSaveFlag;
 #ifdef KAB_EMBEDDED
    KAddressBookMain *mMainWindow;  // should be the same like mGUIClient
 #endif //KAB_EMBEDDED
    // LR *******************************
    // sync stuff!
    QPopupMenu *syncMenu;
    void fillSyncMenu();
    QString mCurrentSyncDevice;
    QString mCurrentSyncName;
    void quickSyncLocalFile();
    bool  syncWithFile( QString fn , bool quick );
    void KABCore::syncLocalFile();
    void KABCore::syncPhone();
    void KABCore::syncSharp();
    void multiSync( bool askforPrefs  );
    int mCurrentSyncProfile ;
    void syncRemote( KSyncProfile* prof,  bool ask = true);
    void edit_sync_options();
    bool syncAB(QString filename, int mode);
    int ringSync();
    QString  getPassword( );
    int mGlobalSyncMode; 
    bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode);
    KABC::Addressee getLastSyncAddressee();
    QDateTime mLastAddressbookSync;
+    int  takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full );
  public slots:
    void confSync();
    // *********************
 };
 #endif