4 files changed, 56 insertions, 24 deletions

diff --git a/kde2file/caldump/main.cpp b/kde2file/caldump/main.cpp
index 03571b9..755e792 100644
--- a/kde2file/caldump/main.cpp
+++ b/kde2file/caldump/main.cpp
@@ -156,56 +156,63 @@ int main( int argc, char *argv[] )
         localCalendar = new CalendarLocal();
         localCalendar->setTimeZoneId( calendarResource->timeZoneId());
         FileStorage* storage = new FileStorage( localCalendar );
         storage->setFileName( fileName );
         int num = 0;
         int del = 0;
         int add = 0;
         if ( storage->load() ) {
             qDebug("*************************loaded!");
             KCal::Incidence::List  newInc = localCalendar->rawIncidences();
             Incidence::List::ConstIterator it;
             for( it = newInc.begin(); it != newInc.end(); ++it ) {
-                Incidence* cl = (*it)->clone();
-                Incidence *incOld = calendarResource->incidence( cl->uid() );
-                ResourceCalendar * res = 0;
-                if ( incOld )
-                    res = calendarResource->resource( incOld );
-                if ( res ) {
-                    ++num;
-                    if ( incOld->type() == "Journal" )
-                        calendarResource->deleteJournal( (Journal *) incOld  );
-                    else if ( incOld->type() == "Todo" )
-                        calendarResource->deleteTodo( (Todo *) incOld );
-                    else if ( incOld->type() == "Event" )
-                        calendarResource->deleteEvent( (Event *) incOld );
-                    
-                    if ( cl->type() == "Journal" )
-                        calendarResource->addJournal( (Journal *) cl, res  );
-                    else if ( cl->type() == "Todo" )
-                        calendarResource->addTodo( (Todo *) cl, res  );
-                    else if ( cl->type() == "Event" )
-                        calendarResource->addEvent( (Event *) cl, res  );
-
-                } else {
-                    if ( incOld ) {
-                        qDebug("ERROR: no resource found for old incidence "); 
+                if ( (*it)->pilotId() > 0 ) { //changed
+                    Incidence* cl = (*it)->clone();
+                    Incidence *incOld = calendarResource->incidence( cl->uid() );
+                    ResourceCalendar * res = 0;
+                    if ( incOld )
+                        res = calendarResource->resource( incOld );
+                    if ( res ) {
+                        cl->setPilotId( incOld->pilotId() );
+                        ++num;
                         if ( incOld->type() == "Journal" )
                             calendarResource->deleteJournal( (Journal *) incOld  );
                         else if ( incOld->type() == "Todo" )
                             calendarResource->deleteTodo( (Todo *) incOld );
                         else if ( incOld->type() == "Event" )
                             calendarResource->deleteEvent( (Event *) incOld );
+                    
+                        if ( cl->type() == "Journal" )
+                            calendarResource->addJournal( (Journal *) cl, res  );
+                        else if ( cl->type() == "Todo" )
+                            calendarResource->addTodo( (Todo *) cl, res  );
+                        else if ( cl->type() == "Event" )
+                            calendarResource->addEvent( (Event *) cl, res  );
+
+                    } else {
+                        if ( incOld ) {
+                            qDebug("ERROR: no resource found for old incidence "); 
+                            if ( incOld->type() == "Journal" )
+                                calendarResource->deleteJournal( (Journal *) incOld  );
+                            else if ( incOld->type() == "Todo" )
+                                calendarResource->deleteTodo( (Todo *) incOld );
+                            else if ( incOld->type() == "Event" )
+                                calendarResource->deleteEvent( (Event *) incOld );
                         
+                        }
+                        calendarResource->addIncidence( cl );
+                        ++add;
                     }
+                } else { // added
+                    Incidence* cl = (*it)->clone();
                     calendarResource->addIncidence( cl );
                     ++add;
                 }
             }
             KCal::Incidence::List  allInc = calendarResource->rawIncidences();
                 
             for( it = allInc.begin(); it != allInc.end(); ++it ) {
                 ResourceCalendar * re = calendarResource->resource( (*it) );
                 if ( re && !re->readOnly() ) {
                     Incidence* cl = localCalendar->incidence( (*it)->uid() );
                     if ( !cl ) {
                         ++del;  
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 1f8ad5b..f727cd4 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -923,24 +923,29 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     int changedRemote = 0;
     //QPtrList<Event> el = local->rawEvents(); 
     Event* eventR;
     QString uid;
     int take;
     Event* eventL;
     Event* eventRSync;
     Event* eventLSync;
     QPtrList<Event>  eventRSyncSharp = remote->getExternLastSyncEvents();
     QPtrList<Event>  eventLSyncSharp = local->getExternLastSyncEvents();
     bool fullDateRange = false;
     local->resetTempSyncStat();
+#ifdef DESKTOP_VERSION
+    //Needed for KDE - OL sync
+    local->resetPilotStat();
+    remote->resetPilotStat();
+#endif
     mLastCalendarSync = QDateTime::currentDateTime();
     QDateTime modifiedCalendar = mLastCalendarSync;;
     eventLSync = getLastSyncEvent();
     eventR = remote->event("last-syncEvent-"+mCurrentSyncName );
     if ( eventR ) {
         eventRSync = (Event*) eventR->clone();
         remote->deleteEvent(eventR );
 
     } else {
         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
             eventRSync = (Event*)eventLSync->clone();
         } else {
@@ -1017,24 +1022,27 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL )
                             inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
                         else
                             idS = inR->IDStr();
                         remote->deleteIncidence( inR );
                         if ( inL->revision() < maxrev )
                             inL->setRevision( maxrev );
                         inR = inL->clone();
                         inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                         if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL )
                             inR->setIDStr( idS );
                         remote->addIncidence(  inR );
+#ifdef DESKTOP_VERSION
+                        inR->setPilotId( 1 );
+#endif
                         ++changedRemote;
                     } else {
                         if ( inR->revision() < maxrev )
                             inR->setRevision( maxrev );
                         idS = inL->IDStr();
                         local->deleteIncidence( inL );
                         inL = inR->clone();
                         inL->setIDStr( idS );
                         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                             inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
                             inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) );
                         }
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index a3977d7..eeb5f48 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -239,24 +239,40 @@ QPtrList<Incidence> Calendar::incidences()
 
   QPtrList<Event> e = events();
   for( i = e.first(); i; i = e.next() ) incidences.append( i );
 
   QPtrList<Todo> t = todos();
   for( i = t.first(); i; i = t.next() ) incidences.append( i );
 
   QPtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) incidences.append( i );
 
   return incidences;
 }
+
+void Calendar::resetPilotStat()
+{
+ QPtrList<Incidence> incidences;
+  
+  Incidence *i;
+
+  QPtrList<Event> e = rawEvents();
+  for( i = e.first(); i; i = e.next() ) i->setPilotId( 0 );
+
+  QPtrList<Todo> t = rawTodos();
+  for( i = t.first(); i; i = t.next() ) i->setPilotId( 0 );
+
+  QPtrList<Journal> j = journals();
+  for( i = j.first(); i; i = j.next() ) i->setPilotId( 0 );
+}
 void Calendar::resetTempSyncStat()
 {
  QPtrList<Incidence> incidences;
   
   Incidence *i;
 
   QPtrList<Event> e = rawEvents();
   for( i = e.first(); i; i = e.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 
   QPtrList<Todo> t = rawTodos();
   for( i = t.first(); i; i = t.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index c45d81f..d5294eb 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -58,24 +58,25 @@ namespace KCal {
   Calendar.
 */
 class Calendar : public QObject, public CustomProperties,
                  public IncidenceBase::Observer
 {
     Q_OBJECT
 public:
     Calendar();
     Calendar(const QString &timeZoneId);
     virtual ~Calendar();
     void deleteIncidence(Incidence *in);
     void resetTempSyncStat();
+    void resetPilotStat();
     /**
       Clears out the current calendar, freeing all used memory etc.
     */
     virtual void close() = 0;
   
     /**
       Sync changes in memory to persistant storage.
     */
     virtual void save() = 0;
     virtual QPtrList<Event> getExternLastSyncEvents() = 0;
     virtual bool isSaving() { return false; }