1 files changed, 16 insertions, 1 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 8d024c1..1800cf2 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1604,6 +1604,7 @@ void CalendarView::checkExternalId( Incidence * inc )
     checkExternSyncEvent( lastSync, inc );
 
 }
+// SSSSSSSSSSSSSSSSSSSSSS
 bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int mode )
 {
 
@@ -1723,8 +1724,15 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
         QString idS;
         qApp->processEvents();
         if ( !skipIncidence ) {
-            inL = local->incidenceForUid( uid , false , true );
+            int hasCalId = 0;
+            inL = local->incidenceForUid( uid , false , true, &hasCalId );
+            if ( hasCalId && !inL )
+                inL = local->incidenceForUid( uid , false , true, &hasCalId );
+            else
+                hasCalId = 0;
             if ( inL ) { // maybe conflict - same uid in both calendars
+                if ( hasCalId )
+                    qDebug("KO: Cal id %d conflict detected: %s  ",  hasCalId, inL->summary().latin1());
                 if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) {
                     //qDebug("take %d %s ", take, inL->summary().latin1());
                     if ( take == 3 )
@@ -1750,6 +1758,8 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                             idS = inL->IDStr();
                             int pid = inL->pilotId();
                             int calID = inL->calID();
+                            if ( hasCalId )
+                                calID = hasCalId; 
                             local->deleteIncidence( inL );
                             inL = inR->clone();
                             inL->setCalID_block( calID );
@@ -1764,6 +1774,11 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                             ++changedLocal;
                         }
                     }
+                } else {
+                    // take == 0; events equal
+                    if ( hasCalId  )
+                        qDebug("EV EQUALLLL **************************** ");
+
                 }
             } else { //  no conflict ********** add or delete remote 
                 if ( !filterIN || filterIN->filterCalendarItem( inR  ) ){