6 files changed, 41 insertions, 13 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index ccacc52..a350c3b 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1131,350 +1131,351 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
    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 = ( localMod > mLastCalendarSync );
        if ( !remCh && ! locCh ) {
            //qDebug("both not changed ");
            lastSync = localMod.addDays(1);
            if ( mode <= SYNC_PREF_ASK )
                return 0;
        } else {
            if ( locCh ) {
                //qDebug("loc changed %d %s %s", local->revision() , localMod.toString().latin1(), mLastCalendarSync.toString().latin1());
                lastSync = localMod.addDays( -1 );
                if ( !remCh )
                    remoteMod = ( lastSync.addDays( -1 ) );
            } else {
                //qDebug(" not loc changed ");
                lastSync = localMod.addDays( 1 );
                if ( remCh )
                    remoteMod =( lastSync.addDays( 1 ) );
                
            }
        }
        full = true;  
        if ( mode < SYNC_PREF_ASK )
            mode = SYNC_PREF_ASK;
    } else {
          if ( localMod == remoteMod )
              // 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", localMod.toString().latin1() , local->revision(), remoteMod.toString().latin1(), remote->revision());  
    //qDebug("%d %d %d %d ", localMod.time().second(), localMod.time().msec(),  remoteMod.time().second(), remoteMod.time().msec() );
    //full = true; //debug only
    if ( full ) {
        bool equ = false;
        if ( local->typeID() == eventID ) {
            equ =  (*((Event*) local) == *((Event*) remote));
        }
        else if ( local->typeID() == todoID )
            equ =  (*((Todo*) local) == (*(Todo*) remote));
        else if ( local->typeID() == journalID )
            equ =  (*((Journal*) local) == *((Journal*) 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()  ,  localMod.toString().latin1() , remoteMod.toString().latin1()  );
    // ************************************************
    // ************************************************
    // ************************************************
    // We may have that lastSync > remoteMod  AND  lastSync > localMod 
    // BUT  remoteMod != localMod 
    if ( full && mode < SYNC_PREF_NEWEST )
        mode = SYNC_PREF_ASK;
    switch( mode ) {
    case SYNC_PREF_LOCAL:
        if ( lastSync > remoteMod )
            return 1;
        if ( lastSync > localMod )
            return 2;
        return 1;
        break;
    case SYNC_PREF_REMOTE:
        if ( lastSync > localMod )
            return 2;
        if ( lastSync > remoteMod )
            return 1;
        return 2;
        break;
    case SYNC_PREF_NEWEST:
        if ( localMod >= remoteMod )
            return 1;
        else
            return 2;
        break;
    case SYNC_PREF_ASK: 
-        //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1()  );
+        qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1()  );
        if ( lastSync > remoteMod && lastSync > localMod)
            return 0;
        if ( lastSync > remoteMod )
            return 1;
        if ( lastSync > localMod )
            return 2;
-        //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1()  );
+        qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1()  );
        localIsNew = localMod >= remoteMod;
        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 );
        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;
 }
 Event* CalendarView::getLastSyncEvent()
 {
    Event* lse; 
    //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() );
    lse =   mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice );
    if (!lse) {
        lse = new Event();
        lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); 
        QString sum = "";
        if ( mSyncManager->mExternSyncProfiles.contains( mCurrentSyncDevice ) )
            sum = "E: ";
        lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event"));
        lse->setDtStart( mLastCalendarSync );
        lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) );
        lse->setCategories( i18n("SyncEvent") );
        lse->setReadOnly( true );
        mCalendar->addEvent( lse );
    }
    return lse;
 }
 // we check, if the to delete event has a id for a profile
 //  if yes, we set this id in the profile to delete
 void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete )
 {
    if ( lastSync.count() == 0 ) {
        //qDebug(" lastSync.count() == 0");
        return;
    }
    if ( toDelete->typeID() == journalID )
        return;
    Event* eve = lastSync.first();
    while ( eve ) {
        QString id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name
        if ( !id.isEmpty() ) {
            QString des = eve->description();
            QString pref = "e";
            if ( toDelete->typeID() == todoID )
                pref = "t";
            des += pref+  id  + ",";
            eve->setReadOnly( false );
            eve->setDescription( des );
            //qDebug("setdes %s ", des.latin1());
            eve->setReadOnly( true );
        }
        eve = lastSync.next();
    }
 }
 void CalendarView::checkExternalId( Incidence * inc )
 {
    QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ;
    checkExternSyncEvent( lastSync, inc );
 }
 bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int mode )
 {
    bool syncOK = true;
    int addedEvent = 0;
    int addedEventR = 0;
    int deletedEventR = 0;
    int deletedEventL = 0;
    int changedLocal = 0;
    int changedRemote = 0;
    int filteredIN = 0;
    int filteredOUT = 0;
    //QPtrList<Event> el = local->rawEvents(); 
    Event* eventR;
    QString uid;
    int take;
    Event* eventRSync;
    Event* eventLSync;
    clearAllViews();
    QPtrList<Event>  eventRSyncSharp = remote->getExternLastSyncEvents();
    QPtrList<Event>  eventLSyncSharp = local->getExternLastSyncEvents();
    bool fullDateRange = false;
    local->resetTempSyncStat();
    mLastCalendarSync = QDateTime::currentDateTime();
    if ( mSyncManager->syncWithDesktop() ) {
        remote->resetPilotStat(1);
        if (  KSyncManager::mRequestedSyncEvent.isValid() ) {
            mLastCalendarSync = KSyncManager::mRequestedSyncEvent;
            qDebug("KO: using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() );
            } else {
            qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime ");
        }
    }
    QDateTime modifiedCalendar = mLastCalendarSync;
    eventLSync = getLastSyncEvent();
    eventR = remote->event("last-syncEvent-"+mCurrentSyncName );
    if ( eventR ) {
+        qDebug("last-syncEvent on remote found ");
        eventRSync = (Event*) eventR->clone();
        remote->deleteEvent(eventR );
    } else {
        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncManager->syncWithDesktop()) {
            eventRSync = (Event*)eventLSync->clone();
        } else {
            fullDateRange = true;
            eventRSync = new Event();
            eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event"));
            eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); 
            eventRSync->setDtStart( mLastCalendarSync );
            eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) );
            eventRSync->setCategories( i18n("SyncEvent") );
        }
    }
    if ( eventLSync->dtStart() == mLastCalendarSync )
        fullDateRange = true;
   
    if ( ! fullDateRange  ) {
        if ( eventLSync->dtStart() != eventRSync->dtStart() ) {
            
-            // qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); 
+            qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); 
            //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec());
            fullDateRange = true;
        } 
    }
    if ( mSyncManager->syncWithDesktop() ) {
        fullDateRange = ( eventLSync->dtStart() <= mLastCalendarSync && eventLSync->dtStart().addSecs(1) >= mLastCalendarSync  ); 
    }
    if ( fullDateRange )
        mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365);
    else
        mLastCalendarSync = eventLSync->dtStart();
    // for resyncing if own file has changed
    if ( mCurrentSyncDevice == "deleteaftersync" ) {
        mLastCalendarSync = loadedFileVersion;
        //qDebug("setting mLastCalendarSync ");
    }
    //qDebug("*************************** ");
    qDebug("KO: mLastCalendarSync %s .Full: %d",mLastCalendarSync.toString().latin1(), fullDateRange);
    QPtrList<Incidence> er = remote->rawIncidences(); 
    Incidence* inR = er.first();
    Incidence* inL;
    QProgressBar bar( er.count(),0 );
    bar.setCaption (i18n("Syncing - close to abort!") );
    
    // ************** setting up filter *************
    CalFilter *filterIN = 0;
    CalFilter *filterOUT = 0;
    CalFilter *filter = mFilters.first();
    while(filter) {
        if ( filter->name() == mSyncManager->mFilterInCal )
            filterIN = filter;
        if ( filter->name() == mSyncManager->mFilterOutCal )
            filterOUT = filter;
        filter = mFilters.next();
    }
    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 ( inR ) {
        if ( ! bar.isVisible() )
            return false;
        if ( incCounter % modulo == 0 )
            bar.setProgress( incCounter );
        ++incCounter;
        uid = inR->uid(); 
        bool skipIncidence = false;
        if ( uid.left(15) == QString("last-syncEvent-") )
            skipIncidence = true;
        QString idS;
        qApp->processEvents();
        if ( !skipIncidence ) {
            inL = local->incidence( uid );
            if ( inL ) { // maybe conflict - same uid in both calendars
                if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) {
                    //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) );
                        else
                            idS = inR->IDStr();
                        int calID = inR->calID();
                        remote->deleteIncidence( inR );
                        inR = inL->clone();
                        inR->setCalID( calID );
                        inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                        if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL )
                            inR->setIDStr( idS );
                        remote->addIncidence(  inR );
                        if ( mSyncManager->syncWithDesktop() )
                            inR->setPilotId( 2 );
                        ++changedRemote;
                    } else {// take remote  **********************
                        idS = inL->IDStr();
                        int pid = inL->pilotId();
                        int calID = inL->calID();
                        local->deleteIncidence( inL );
                        inL = inR->clone();
                        inL->setCalID( calID );
                        if ( mSyncManager->syncWithDesktop() )
                            inL->setPilotId( pid  );
                        inL->setIDStr( idS );
                        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                            inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
                            inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) );
                        }
                        local->addIncidence(  inL  );
                        ++changedLocal;
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 14a1a45..95477cd 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -1,175 +1,176 @@
 /*
    This file is part of libkcal.
    Copyright (c) 1998 Preston Brown
    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.
 */
 #ifndef CALENDAR_H
 #define CALENDAR_H
 #include <qobject.h>
 #include <qstring.h>
 #include <qdatetime.h>
 #include <qptrlist.h>
 #include <qdict.h>
 #include "customproperties.h"
 #include "event.h"
 #include "todo.h"
 #include "journal.h"
 #include "calfilter.h"
 //#define _TIME_ZONE "-0500" /* hardcoded, overridden in config file. */
 class KConfig;
 namespace KCal {
 /**
  This is the main "calendar" object class for KOrganizer.  It holds
  information like all appointments/events, user information, etc. etc.
  one calendar is associated with each CalendarView (@see calendarview.h).
  This is an abstract base class defining the interface to a calendar. It is
  implemented by subclasses like @see CalendarLocal, which use different
  methods to store and access the data.
  Ownership of events etc. is handled by the following policy: As soon as an
  event (or any other subclass of IncidenceBase) object is added to the
  Calendar by addEvent() it is owned by the Calendar object. The Calendar takes
  care of deleting it. All Events returned by the query functions are returned
  as pointers, that means all changes to the returned events are immediately
  visible in the Calendar. You shouldn't delete any Event object you get from
  Calendar.
 */
 class Calendar : public QObject, public CustomProperties,
                 public IncidenceBase::Observer
 {
    Q_OBJECT
 public:
    Calendar();
    Calendar(const QString &timeZoneId);
    virtual ~Calendar();
    Incidence * undoIncidence() { return mUndoIncidence; };
    bool undoDeleteIncidence();
    void deleteIncidence(Incidence *in);
    void resetTempSyncStat();
    void resetPilotStat(int id);
    /**
      Clears out the current calendar, freeing all used memory etc.
    */
    virtual void close() = 0;
    virtual void addCalendar( Calendar*  ) = 0;
    virtual bool addCalendarFile( QString name, int id ) = 0;
    virtual bool mergeCalendarFile( QString name ) = 0;
+    virtual Incidence* incidenceForUid( const QString& uid, bool doNotCheckDuplicates  ) = 0;
    virtual void setSyncEventsReadOnly() = 0;
    virtual void stopAllTodos() = 0;
  
    /**
      Sync changes in memory to persistant storage.
    */
    virtual void save() = 0;
    virtual QPtrList<Event> getExternLastSyncEvents() = 0;
    virtual void removeSyncInfo( QString syncProfile) = 0; 
    virtual bool isSaving() { return false; }
    /**
      Return the owner of the calendar's full name.
    */
    const QString &getOwner() const;
    /**
      Set the owner of the calendar. Should be owner's full name.
    */
    void setOwner( const QString &os );
    /**
      Return the email address of the calendar owner.
    */
    const QString &getEmail();
    /**
      Set the email address of the calendar owner.
    */
    void setEmail( const QString & );
  
    /**
      Set time zone from a timezone string (e.g. -2:00)
    */
    void setTimeZone( const QString &tz );
    /**
      Set time zone from a minutes value (e.g. -60)
    */
    void setTimeZone( int tz );
    /**
      Return time zone as offest in minutes.
    */
    int getTimeZone() const;
    /**
      Compute an ISO 8601 format string from the time zone.
    */
    QString getTimeZoneStr() const;
    /**
      Set time zone id (see /usr/share/zoneinfo/zone.tab for list of legal
      values).
    */
    void setTimeZoneId( const QString & );
    /**
      Return time zone id.
    */
    QString timeZoneId() const;
    /**
      Use local time, not UTC or a time zone.
    */
    void setLocalTime();
    /**
      Return whether local time is being used.
    */
    bool isLocalTime() const;
  
    /**
      Add an incidence to calendar.
      
      @return true on success, false on error.
    */
    virtual bool addIncidence( Incidence * ); 
    // Adds an incidence and all relatedto incidences to the cal 
    void addIncidenceBranch( Incidence * );  
    /**
      Return filtered list of all incidences of this calendar.
    */
    virtual QPtrList<Incidence> incidences();
    /**
      Return unfiltered list of all incidences of this calendar.
    */
    virtual QPtrList<Incidence> rawIncidences();
    /**
      Adds a Event to this calendar object.
      @param anEvent a pointer to the event to add
      
      @return true on success, false on error.
    */
    virtual bool addEventNoDup( Event *event ) = 0;
    virtual bool addAnniversaryNoDup( Event *event ) = 0;
    virtual bool addEvent( Event *anEvent ) = 0;
    /**
      Delete event from calendar.
    */
    virtual void deleteEvent( Event * ) = 0;
    /**
      Retrieves an event on the basis of the unique string ID.
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 3e42ec0..e37a7ad 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -1,241 +1,260 @@
 /*
    This file is part of libkcal.
    Copyright (c) 1998 Preston Brown
    Copyright (c) 2001,2003 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.
 */
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qptrlist.h>
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include "vcaldrag.h"
 #include "vcalformat.h"
 #include "icalformat.h"
 #include "exceptions.h"
 #include "incidence.h"
 #include "journal.h"
 #include "filestorage.h"
 #include "calfilter.h"
 #include "calendarlocal.h"
 // #ifndef DESKTOP_VERSION
 // #include <qtopia/alarmserver.h> 
 // #endif
 using namespace KCal;
 CalendarLocal::CalendarLocal()
  : Calendar()
 {
  init();
 }
 CalendarLocal::CalendarLocal(const QString &timeZoneId)
  : Calendar(timeZoneId)
 {
  init();
 }
 void CalendarLocal::init()
 {
    mNextAlarmIncidence = 0;
 }
 CalendarLocal::~CalendarLocal()
 {
    if ( mDeleteIncidencesOnClose )
        close();
 }
 bool CalendarLocal::mergeCalendarFile( QString name )
 {
    CalendarLocal calendar( timeZoneId() );
    calendar.setDefaultCalendar( 1 );
    if ( calendar.load( name ) ) {
        mergeCalendar( &calendar  );
        return true;
    }
    return false;
 }
 
-Incidence* CalendarLocal::incidenceForUid( const QString& uid )
+Incidence* CalendarLocal::incidenceForUid( const QString& uid , bool doNotCheckDuplicates) 
 {
    Todo *todo;;
    Incidence *retVal = 0;
    for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
        if ( todo->uid() == uid ) {
+            if ( doNotCheckDuplicates ) return todo;
            if ( retVal ) {
                if ( retVal->calID() > todo->calID() ) {
                    retVal = todo;
                }
            } else {
                retVal = todo;
            }
        } 
    }
    if ( retVal ) return retVal;
    Event *event;
    for ( event = mEventList.first(); event; event = mEventList.next() ) {
        if (  event->uid() == uid ) {
+            if ( doNotCheckDuplicates ) return event;
            if ( retVal ) {
                if ( retVal->calID() > event->calID() ) {
                    retVal = event;
                }
            } else {
                retVal = event;
            }
        }
    }
    if ( retVal ) return retVal;
    for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
        if ( it->uid() == uid ) {
+            if ( doNotCheckDuplicates ) return it;
            if ( retVal ) {
                if ( retVal->calID() > it->calID() ) {
                    retVal = it;
                }
            } else {
                retVal = it;
            }
        }
    return retVal;
 }
 bool CalendarLocal::mergeCalendar( Calendar* remote  )
 {
+    // 1 look for raw inc in local
+    //   if inc not in remote, delete in local
+    // 2 look for raw inc in remote
+    //   if inc in local, replace it
+    //   if not in local, add it to default calendar
+    QPtrList<Incidence> localInc = rawIncidences(); 
+    Incidence* inL = localInc.first(); 
+    while ( inL ) {
+        if ( ! inL->isReadOnly () )
+            if ( !remote->incidenceForUid( inL->uid(), true ))
+                deleteIncidence( inL );
+        inL = localInc.next();
+    }
    QPtrList<Incidence> er = remote->rawIncidences(); 
    Incidence* inR = er.first();
-    Incidence* inL; 
    while ( inR ) {
-        inL = incidenceForUid( inR->uid() );
+        inL = incidenceForUid( inR->uid(),false );
        if ( inL ) {
-            int calID = inL->calID();
+            if ( ! inL->isReadOnly () || inL->uid().left(15) == QString("last-syncEvent-") ) {
-            deleteIncidence( inL );
+                int calID = inL->calID();
-            inL = inR->clone();
+                deleteIncidence( inL );
-            inL->setCalID( calID );
+                inL = inR->clone();
-            addIncidence( inL );
+                inL->setCalID( calID );
+                addIncidence( inL );
+            }
        } else {
            inL = inR->clone();
            inL->setCalID( 0 );// add to default cal
            addIncidence( inL );
        }
        inR = er.next();
    }
    return true;
 }
 bool CalendarLocal::addCalendarFile( QString name, int id )
 {
    CalendarLocal calendar( timeZoneId() );
    calendar.setDefaultCalendar( id );
    if ( calendar.load( name ) ) {
        addCalendar( &calendar  );
        return true;
    }
    return false;
 }
 void CalendarLocal::setSyncEventsReadOnly()
 {
    Event * ev;
    ev = mEventList.first();
    while ( ev ) {
        if ( ev->uid().left(15) == QString("last-syncEvent-") )
            ev->setReadOnly( true );
        ev =  mEventList.next();
    } 
 }
 void CalendarLocal::addCalendar( Calendar* cal )
 {
    cal->setDontDeleteIncidencesOnClose();
    {
        QPtrList<Event> EventList = cal->rawEvents();
        Event * ev = EventList.first();
        while ( ev ) {
            ev->unRegisterObserver( cal );
            ev->registerObserver( this );
            mEventList.append( ev );
            ev = EventList.next();
        }
    }
    {
        QPtrList<Todo> TodoList = cal->rawTodos();
        Todo * ev = TodoList.first();
        while ( ev ) {
            QString rel = ev->relatedToUid();
            if ( !rel.isEmpty() ){
                ev->setRelatedTo ( 0 );
                ev->setRelatedToUid( rel );
            }
            ev = TodoList.next();
        }
        //TodoList = cal->rawTodos();
        ev = TodoList.first();
        while ( ev ) {
            ev->unRegisterObserver( cal );
            ev->registerObserver( this );
            mTodoList.append( ev );
            setupRelations( ev );
            ev = TodoList.next();
        }
    }
    {
        QPtrList<Journal> JournalList = cal->journals();
        Journal * ev = JournalList.first();
        while ( ev ) {
            ev->unRegisterObserver( cal );
            ev->registerObserver( this );
            mJournalList.append( ev );
            ev = JournalList.next();
        }
    }
    setModified( true );
 }
 bool CalendarLocal::load( const QString &fileName )
 {
  FileStorage storage( this, fileName );
  return storage.load();
 }
 bool CalendarLocal::save( const QString &fileName, CalFormat *format )
 {
  FileStorage storage( this, fileName, format );
  return storage.save();
 }
 void CalendarLocal::stopAllTodos()
 {
    for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
        it->setRunning( false );
 }
 void CalendarLocal::close()
 {
  Todo * i;
  for( i = mTodoList.first(); i; i = mTodoList.next() ) i->setRunning(false);
  mEventList.setAutoDelete( true );
  mTodoList.setAutoDelete( true );
  mJournalList.setAutoDelete( false );
  mEventList.clear();
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index 23b0542..a7a85c8 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -1,146 +1,146 @@
 /*
    This file is part of libkcal.
    Copyright (c) 1998 Preston Brown
    Copyright (c) 2001,2003 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.
 */
 #ifndef KCAL_CALENDARLOCAL_H
 #define KCAL_CALENDARLOCAL_H
 #include "calendar.h"
 namespace KCal {
 class CalFormat;
 /**
  This class provides a calendar stored as a local file.
 */
 class CalendarLocal : public Calendar
 {
  public:
    /**
      Constructs a new calendar, with variables initialized to sane values.
    */
    CalendarLocal();
    /**
      Constructs a new calendar, with variables initialized to sane values.
    */
    CalendarLocal( const QString &timeZoneId );
    ~CalendarLocal();
    void addCalendar( Calendar*  );
    bool addCalendarFile( QString name, int id );
    bool mergeCalendarFile( QString name );
    bool mergeCalendar( Calendar* cal );
-    Incidence* incidenceForUid( const QString& uid );
+    Incidence* incidenceForUid( const QString& uid, bool doNotCheckDuplicates  );
    void setSyncEventsReadOnly();
    void stopAllTodos();
    /**
      Loads a calendar on disk in vCalendar or iCalendar format into the current
      calendar. Any information already present is lost.
      @return true, if successfull, false on error.
      @param fileName the name of the calendar on disk.
    */
    bool load( const QString &fileName );
    /**
      Writes out the calendar to disk in the specified \a format.
      CalendarLocal takes ownership of the CalFormat object.
      @return true, if successfull, false on error.
      @param fileName the name of the file
    */
    bool save( const QString &fileName, CalFormat *format = 0 );
    /**
      Clears out the current calendar, freeing all used memory etc. etc.
    */
    void close();
    void save() {}
  
    /**
      Add Event to calendar.
    */
    void removeSyncInfo( QString syncProfile); 
    bool addAnniversaryNoDup( Event *event );
    bool addEventNoDup( Event *event );
    bool addEvent( Event *event );
    /** 
      Deletes an event from this calendar.
    */
    void deleteEvent( Event *event );
    /**
      Retrieves an event on the basis of the unique string ID.
    */
    Event *event( const QString &uid );
    /**
      Return unfiltered list of all events in calendar.
    */
    QPtrList<Event> rawEvents();
    QPtrList<Event> getExternLastSyncEvents();
    /**
      Add a todo to the todolist.
    */
    bool addTodo( Todo *todo );
    bool addTodoNoDup( Todo *todo );
    /**
      Remove a todo from the todolist.
    */
    void deleteTodo( Todo * );
    /**
      Searches todolist for an event with this unique string identifier,
      returns a pointer or null.
    */
    Todo *todo( const QString &uid );
    /**
      Return list of all todos.
    */
    QPtrList<Todo> rawTodos();
    /**
      Returns list of todos due on the specified date.
    */
    QPtrList<Todo> todos( const QDate &date );
    /**
      Return list of all todos.
      
      Workaround because compiler does not recognize function of base class.
    */
    QPtrList<Todo> todos() { return Calendar::todos(); }
    /**
      Add a Journal entry to calendar.
    */
    bool addJournal( Journal * );
    /**
      Remove a Journal from the calendar.
    */
    void deleteJournal( Journal * );
    /**
      Return Journal for given date.
    */
    Journal *journal( const QDate & );
    QPtrList<Journal> journals4Date( const QDate & );
    /**
      Return Journal with given UID.
    */
    Journal *journal( const QString &uid );
    /**
      Return list of all Journals stored in calendar.
    */
    QPtrList<Journal> journals();
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index dcead02..1a19f3e 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -1,287 +1,293 @@
 /*
    This file is part of libkcal.
    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.
 */
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kidmanager.h>
 #include "calformat.h"
 #include "syncdefines.h"
 #include "incidencebase.h"
 using namespace KCal;
 IncidenceBase::IncidenceBase() :
  mReadOnly(false), mFloats(true), mDuration(0), mHasDuration(false),
  mPilotId(0), mSyncStatus(SYNCMOD)
 {
+  blockLastModified = false;
  setUid(CalFormat::createUniqueId());
  mOrganizer = "";
  mFloats = false;
  mDuration = 0;
  mHasDuration = false;
  mPilotId = 0;
  mExternalId = ":";
  mTempSyncStat =  SYNC_TEMPSTATE_INITIAL;
  mSyncStatus = 0;
  mAttendees.setAutoDelete( true );
  mCalEnabled = true;
  mAlarmEnabled = true;
  mCalID = 0;
 }
 IncidenceBase::IncidenceBase(const IncidenceBase &i) :
  CustomProperties( i )
 {
+  blockLastModified = false;
  mReadOnly = i.mReadOnly;
  mDtStart = i.mDtStart;
  mDuration = i.mDuration;
  mHasDuration = i.mHasDuration;
  mOrganizer = i.mOrganizer;
  mUid = i.mUid;
  mCalEnabled = i.mCalEnabled;
  mAlarmEnabled = i.mAlarmEnabled;
  mCalID = i.mCalID;
  QPtrList<Attendee> attendees = i.attendees();
  for( Attendee *a = attendees.first(); a; a = attendees.next() ) {
    mAttendees.append( new Attendee( *a ) );
  }
  mFloats = i.mFloats;
  mLastModified = i.mLastModified;
  mPilotId = i.mPilotId;
  mTempSyncStat = i.mTempSyncStat;
  mSyncStatus = i.mSyncStatus;
  mExternalId = i.mExternalId;
  // The copied object is a new one, so it isn't observed by the observer
  // of the original object.
  mObservers.clear();
  
  mAttendees.setAutoDelete( true );
 }
 IncidenceBase::~IncidenceBase()
 {
 }
 bool KCal::operator==( const IncidenceBase& i1, const IncidenceBase& i2 )
 {
    // do not compare mSyncStatus and mExternalId 
    if( i1.attendees().count() != i2.attendees().count() ) {
        return false; // no need to check further
    }
    if ( i1.attendees().count() > 0 ) {
        Attendee * a1 = i1.attendees().first(), *a2 =i2.attendees().first() ;
        while ( a1 ) {
            if ( !( (*a1) == (*a2)) ) 
                {
                    //qDebug("Attendee not equal ");
                    return false;
                }
            a1 = i1.attendees().next();
            a2 = i2.attendees().next();
        }
    }
    //if ( i1.dtStart() != i2.dtStart() )
    //  return false;
 #if 0
    qDebug("1 %d ",i1.doesFloat() == i2.doesFloat() );
    qDebug("1 %d ",i1.duration() == i2.duration() );
    qDebug("3 %d ",i1.hasDuration() == i2.hasDuration() );
    qDebug("1 %d ",i1.pilotId() == i2.pilotId() );
    qDebug("1 %d %d %d",i1.syncStatus() == i2.syncStatus() , i1.syncStatus(),i2.syncStatus() );
    qDebug("6 %d ",i1.organizer() == i2.organizer() );
  
 #endif
    if ( i1.hasDuration() == i2.hasDuration() ) {
        if ( i1.hasDuration() ) {
            if ( i1.duration() != i2.duration() )
                return false;
        }
    } else {
        return false;
    }
    return ( i1.organizer() == i2.organizer() &&
             // i1.uid() == i2.uid() &&
             // Don't compare lastModified, otherwise the operator is not
             // of much use. We are not comparing for identity, after all.
             i1.doesFloat() == i2.doesFloat() &&
             i1.pilotId() == i2.pilotId() );// &&  i1.syncStatus() == i2.syncStatus() );
    // no need to compare mObserver
 }
  
 QDateTime IncidenceBase::getEvenTime( QDateTime dt )
 {
    QTime t =  dt.time();
    dt.setTime( QTime (t.hour (), t.minute (), t.second () )  );
    return dt;
 }     
 bool IncidenceBase::isTagged() const
 {
    return mIsTagged;
 }
 void IncidenceBase::setTagged( bool b)
 {
    mIsTagged = b;
 }
 void IncidenceBase::setCalID( int id )
 {
-    if ( mCalID > 0 )
+    if ( mCalID > 0 ) {
+        blockLastModified = true;
        updated();
+        blockLastModified = false;
+    }
    mCalID = id;
 }
 int IncidenceBase::calID() const
 {
    return mCalID;
 }
 void IncidenceBase::setCalEnabled( bool b )
 {
    mCalEnabled = b;
 }
 bool IncidenceBase::calEnabled() const
 {
    return mCalEnabled;
 }
 void IncidenceBase::setAlarmEnabled( bool b )
 {
    mAlarmEnabled = b;
 }
 bool IncidenceBase::alarmEnabled() const
 {
    return mAlarmEnabled;
 }
 void IncidenceBase::setUid(const QString &uid)
 {
  mUid = uid;
  updated();
 }
 QString IncidenceBase::uid() const
 {
  return mUid;
 }
 void IncidenceBase::setLastModified(const QDateTime &lm)
 {
+    if ( blockLastModified ) return;
  // DON'T! updated() because we call this from
  // Calendar::updateEvent().
  mLastModified = getEvenTime(lm);
  //qDebug("IncidenceBase::setLastModified %s ",lm.toString().latin1());
 }
 QDateTime IncidenceBase::lastModified() const
 {
  return mLastModified;
 }
 void IncidenceBase::setOrganizer(const QString &o)
 {
  // we don't check for readonly here, because it is
  // possible that by setting the organizer we are changing
  // the event's readonly status...
  mOrganizer = o;
  if (mOrganizer.left(7).upper() == "MAILTO:")
    mOrganizer = mOrganizer.remove(0,7);
  updated();
 }
 QString IncidenceBase::organizer() const
 {
  return mOrganizer;
 }
 void IncidenceBase::setReadOnly( bool readOnly )
 {
  mReadOnly = readOnly;
 }
 void IncidenceBase::setDtStart(const QDateTime &dtStart)
 {
 //  if (mReadOnly) return;
  mDtStart = getEvenTime(dtStart);
  updated();
 }
 QDateTime IncidenceBase::dtStart() const
 {
  return mDtStart;
 }
 QString IncidenceBase::dtStartTimeStr() const
 {
  return KGlobal::locale()->formatTime(dtStart().time());
 }
 QString IncidenceBase::dtStartDateStr(bool shortfmt) const
 {
  return KGlobal::locale()->formatDate(dtStart().date(),shortfmt);
 }
 QString IncidenceBase::dtStartStr(bool shortfmt) const
 {
    if ( doesFloat() )
        return KGlobal::locale()->formatDate(dtStart().date(),shortfmt);
    return KGlobal::locale()->formatDateTime(dtStart(), shortfmt);
 }
 bool IncidenceBase::doesFloat() const
 {
  return mFloats;
 }
 void IncidenceBase::setFloats(bool f)
 {
  if (mReadOnly) return;
  mFloats = f;
  updated();
 }
 bool IncidenceBase::addAttendee(Attendee *a, bool doupdate)
 {
  if (mReadOnly) return false;
  if (a->name().left(7).upper() == "MAILTO:")
    a->setName(a->name().remove(0,7));
  QPtrListIterator<Attendee> qli(mAttendees);
  
  qli.toFirst();
  while (qli) {
      if (*qli.current() == *a)
          return false;
      ++qli;
  }
  mAttendees.append(a);
  if (doupdate) updated();
  return true;
 }
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index bccf287..bed73db 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -57,129 +57,130 @@ class IncidenceBase : public CustomProperties
    /** Set the unique id for the event */
    void setUid(const QString &);
    /** Return the unique id for the event */
    QString uid() const;
    /** Sets the time the incidence was last modified. */
    void setLastModified(const QDateTime &lm);
    /** Return the time the incidence was last modified. */
    QDateTime lastModified() const;
    /** sets the organizer for the event */
    void setOrganizer(const QString &o);
    QString organizer() const;
    /** Set readonly status. */
    virtual void setReadOnly( bool );
    /** Return if the object is read-only. */
    bool isReadOnly() const { return mReadOnly; }
    /** for setting the event's starting date/time with a QDateTime. */
    virtual void setDtStart(const QDateTime &dtStart);
    /** returns an event's starting date/time as a QDateTime. */
    virtual QDateTime dtStart() const;
    /** returns an event's starting time as a string formatted according to the
     users locale settings */
    QString dtStartTimeStr() const;
    /** returns an event's starting date as a string formatted according to the
     users locale settings */
    QString dtStartDateStr(bool shortfmt=true) const;
    /** returns an event's starting date and time as a string formatted according
     to the users locale settings */
    QString dtStartStr(bool shortfmt=true) const;
    virtual void setDuration(int seconds);
    int duration() const;
    void setHasDuration(bool);
    bool hasDuration() const;
    /** Return true or false depending on whether the incidence "floats,"
     * i.e. has a date but no time attached to it. */
    bool doesFloat() const;
    /** Set whether the incidence floats, i.e. has a date but no time attached to it. */
    void setFloats(bool f);
    /**
      Add Attendee to this incidence. IncidenceBase takes ownership of the
      Attendee object.
    */
    bool addAttendee(Attendee *a, bool doupdate=true );
 //    void removeAttendee(Attendee *a);
 //    void removeAttendee(const char *n);
    /** Remove all Attendees. */
    void clearAttendees();
    /** Return list of attendees. */
    QPtrList<Attendee> attendees() const { return mAttendees; };
    /** Return number of attendees. */
    int attendeeCount() const { return mAttendees.count(); };
    /** Return the Attendee with this email */
    Attendee* attendeeByMail(const QString &);
    /** Return first Attendee with one of this emails */
    Attendee* attendeeByMails(const QStringList &, const QString& email = QString::null);
    /** pilot syncronization states */
    enum { SYNCNONE = 0, SYNCMOD = 1, SYNCDEL = 3 };
    /** Set synchronisation satus. */
    void setSyncStatus(int stat);
    /** Return synchronisation status. */
    int syncStatus() const;
    /** Set Pilot Id. */
    void setPilotId(int id);
    /** Return Pilot Id. */
    int pilotId() const;
    void setTempSyncStat(int id);
    int tempSyncStat() const;
    void setIDStr( const QString & );
    QString IDStr() const;
    void setID( const QString &, const QString & );
    QString  getID( const QString & );
    void setCsum( const QString &, const QString & );
    QString getCsum( const QString & );
    void removeID(const QString &);
    void registerObserver( Observer * );
    void unRegisterObserver( Observer * );
    void updated();
    void setCalID( int id );
    int calID() const;
    void setCalEnabled( bool );
    bool calEnabled() const; 
    void setAlarmEnabled( bool );
    bool alarmEnabled() const;
    bool isTagged() const;
    void setTagged( bool );
  protected:
+    bool blockLastModified;
    bool mIsTagged;
    QDateTime mDtStart;
    bool mReadOnly;
    QDateTime getEvenTime( QDateTime );
  private:
    // base components
    QString mOrganizer;
    QString mUid;
    int mCalID;
    bool mCalEnabled;
    bool mAlarmEnabled;
    QDateTime mLastModified;
    QPtrList<Attendee> mAttendees;
    bool mFloats;
    int mDuration;
    bool mHasDuration;
    QString  mExternalId;
    int mTempSyncStat;
    // PILOT SYNCHRONIZATION STUFF
    int mPilotId;                         // unique id for pilot sync
    int mSyncStatus;                      // status (for sync)
    QPtrList<Observer> mObservers;
 };
 bool operator==( const IncidenceBase&, const IncidenceBase& );
 }
 #endif