From 739fec31c8cea89dd40ff1ce7dd7b84b05e4e973 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Tue, 14 Sep 2004 01:59:37 +0000
Subject: Sync fixes

---
(limited to 'korganizer')

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 94cc97d..ce41fbd 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1013,7 +1013,7 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
         bool skipIncidence = false;
         if ( uid.left(15) == QString("last-syncEvent-") )
             skipIncidence = true;
-       
+        QString idS;
         qApp->processEvents();
         if ( !skipIncidence ) {
             inL = local->incidence( uid );
@@ -1026,19 +1026,27 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                     if ( take == 3 )
                         return false;
                     if ( take == 1  ) {// take local
-                        inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
+                        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 );
                         ++changedRemote;
                     } else {
                         if ( inR->revision() < maxrev )
                             inR->setRevision( maxrev );
+                        idS = inL->IDStr();
                         local->deleteIncidence( inL );
-                        local->addIncidence(  inR->clone()  );
+                        inL = inR->clone();
+                        inL->setIDStr( idS );
+                        local->addIncidence(  inL  );
                         ++changedLocal;
                     }
                 }
@@ -1100,6 +1108,7 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
             if ( ! inR ) { 
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
+                        checkExternSyncEvent(eventLSyncSharp, inL);
                         local->deleteIncidence( inL );
                         ++deletedEventL; 
                     } else {
--
cgit v0.9.0.2