1 files changed, 40 insertions, 13 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index db07713..cfd9290 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -720,37 +720,39 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
     //  void setZaurusUid(int id);
    // int zaurusUid() const;
    // void setZaurusStat(int id);
    // int zaurusStat() const;
     // 0 equal
     // 1 take local
     // 2 take remote
     // 3 cancel 
     QDateTime lastSync = mLastCalendarSync;
     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 = ( local->lastModified() > mLastCalendarSync );
         //qDebug("locCh %d remCh %d locuid %d remuid %d", locCh, remCh,local->zaurusUid(), remote->zaurusUid() );
         if ( !remCh && ! locCh ) {
-            //qDebug("both not changed ");
+            qDebug("both not changed ");
             lastSync = local->lastModified().addDays(1);
         } else {
             if ( locCh ) {
-                //qDebug("loc changed %d %d", local->zaurusStat(), local->revision() );
+                qDebug("loc changed %d", local->revision() );
                 lastSync = local->lastModified().addDays( -1 );
                 if ( !remCh )
                     remote->setLastModified( lastSync.addDays( -1 ) );
             } else {
-                //qDebug(" not loc changed ");
+                qDebug(" not loc changed ");
                 lastSync = local->lastModified().addDays( 1 );
                 if ( remCh )
                     remote->setLastModified( lastSync.addDays( 1 ) );
                 
             }
         }
         full = true;  
         if ( mode < SYNC_PREF_ASK )
             mode = SYNC_PREF_ASK;
     } else {
           if ( local->lastModified() == remote->lastModified() )
             if ( local->revision() == remote->revision() )
@@ -775,24 +777,26 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
             //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("mLastCalendarSync %s lastsync %s --- local %s remote %s ",mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1()  ,  local->lastModified().toString().latin1() , remote->lastModified().toString().latin1()  );
+
     if ( full && mode < SYNC_PREF_NEWEST )
         mode = SYNC_PREF_ASK;
 
     switch( mode ) {
     case SYNC_PREF_LOCAL:
         if ( lastSync > remote->lastModified() )
             return 1;
         if ( lastSync > local->lastModified() )
             return 2;
         return 1;
         break;
     case SYNC_PREF_REMOTE:
@@ -806,25 +810,25 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
         if ( local->lastModified() > remote->lastModified() )
             return 1;
         else
             return 2;
         break;
     case SYNC_PREF_ASK: 
         //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), local->lastModified().toString().latin1(), remote->lastModified().toString().latin1()  );
         if ( lastSync > remote->lastModified() )
             return 1;
         if ( lastSync > local->lastModified() )
             return 2;
         //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), local->lastModified().toString().latin1(), remote->lastModified().toString().latin1()  );
-        localIsNew = local->lastModified() > remote->lastModified();
+        localIsNew = local->lastModified() >= remote->lastModified();
         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()  );
@@ -933,39 +937,43 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     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();
     mLastCalendarSync = QDateTime::currentDateTime();
     QDateTime modifiedCalendar = mLastCalendarSync;;
+    eventLSync = getLastSyncEvent();
     eventR = remote->event("last-syncEvent-"+mCurrentSyncName );
     if ( eventR ) {
         eventRSync = (Event*) eventR->clone();
         remote->deleteEvent(eventR );
 
     } 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 ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
+            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") );
+        }
     }
-    eventLSync = getLastSyncEvent();
     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("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec());
             fullDateRange = true;
         } 
     }
     if ( fullDateRange )
@@ -1107,25 +1115,44 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                     } else {
                         if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) {
                             ++addedEventR; 
                             inL->setLastModified( modifiedCalendar );
                             remote->addIncidence(  inL->clone() );
                         }
                     }
                 }
             }
         }
         inL = el.next();
     }
-     
+    if ( KOPrefs::instance()->mWriteBackInFuture ) {
+        er = remote->rawIncidences(); 
+        inR = er.first();
+        QDateTime dt;
+        QDateTime cur = QDateTime::currentDateTime();
+        QDateTime end = cur.addSecs( KOPrefs::instance()->mWriteBackInFuture * 3600 *24 *7 );
+        while ( inR ) {
+            if ( inR->type() == "Todo" ) {
+                Todo * t = (Todo*)inR;
+                if ( t->hasDueDate() )
+                    dt = t->dtDue();
+                else
+                    dt = cur.addSecs( 62 );
+            }
+            else dt = inR->dtStart();
+            if ( dt < cur || dt > end )
+                remote->deleteIncidence( inR );
+            inR =  er.next();
+        }
+    }
     bar.hide();
     mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 );
     eventLSync->setReadOnly( false );
     eventLSync->setDtStart( mLastCalendarSync );
     eventRSync->setDtStart( mLastCalendarSync );
     eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) );
     eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) );
     eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ;
     eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName  );
     eventLSync->setReadOnly( true );
     if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL)
         remote->addEvent( eventRSync );