kde sync fixes

1 files changed, 3 insertions, 16 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index ff1db2c..290c0b9 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -715,10 +715,4 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
 {
  
-    //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
@@ -944,5 +938,5 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
 
     } else {
-        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
+        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncKDE) {
             eventRSync = (Event*)eventLSync->clone();
         } else {
@@ -974,8 +968,8 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     if ( mCurrentSyncDevice == "deleteaftersync" ) {
         mLastCalendarSync = loadedFileVersion;
-        qDebug("setting mLastCalendarSync ");
+        //qDebug("setting mLastCalendarSync ");
     }
     //qDebug("*************************** ");
-    qDebug("mLastCalendarSync %s ",mLastCalendarSync.toString().latin1() );
+    qDebug("mLastCalendarSync %s full: %d",mLastCalendarSync.toString().latin1(), fullDateRange);
     QPtrList<Incidence> er = remote->rawIncidences(); 
     Incidence* inR = er.first();
@@ -1009,7 +1003,4 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
             inL = local->incidence( uid );
             if ( inL ) { // maybe conflict - same uid in both calendars
-                int maxrev = inL->revision();
-                if ( maxrev < inR->revision() )
-                    maxrev = inR->revision();
                 if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) {
                     //qDebug("take %d %s ", take, inL->summary().latin1());
@@ -1022,6 +1013,4 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                             idS = inR->IDStr();
                         remote->deleteIncidence( inR );
-                        if ( inL->revision() < maxrev )
-                            inL->setRevision( maxrev );
                         inR = inL->clone();
                         inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
@@ -1033,6 +1022,4 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                         ++changedRemote;
                     } else {
-                        if ( inR->revision() < maxrev )
-                            inR->setRevision( maxrev );
                         idS = inL->IDStr();
                         int pid = inL->pilotId();