2 files changed, 18 insertions, 27 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 9160e1d..cbe2a10 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -909,6 +909,12 @@ void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* t
     }
 
 }
+void CalendarView::checkExternalId( Incidence * inc )
+{
+    QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ;
+    checkExternSyncEvent( lastSync, inc );
+
+}
 bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int mode )
 {
     bool syncOK = true;
@@ -1026,7 +1032,7 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                     QString pref = "e";
                     if ( inR->type() == "Todo" )
                         pref = "t";
-                    if ( des.find(pref+QString::number( inR->zaurusId() ) +"," ) >= 0 && mode != 5) { // delete it
+                    if ( des.find(pref+QString::number( inR->getID(mCurrentSyncDevice) ) +"," ) >= 0 && mode != 5) { // delete it
                         inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE );
                         //remote->deleteIncidence( inR );
                         ++deletedEventR; 
@@ -1076,12 +1082,12 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
             inR = remote->incidence( uid );
             if ( ! inR ) { 
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
-                    if ( inL->zaurusId() >= 0 && mode != 4 ) {
+                    if ( inL->getID(mCurrentSyncDevice) >= 0 && mode != 4 ) {
                         local->deleteIncidence( inL );
                         ++deletedEventL; 
                     } else {
                         if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) {
-                            inL->setZaurusId( -1 );
+                            inL->setID(mCurrentSyncDevice, -1 );
                             ++addedEventR; 
                             inL->setLastModified( modifiedCalendar );
                             remote->addIncidence(  inL->clone() );
@@ -1200,7 +1206,7 @@ void CalendarView::syncSharp()
                     if ( inc->tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) {
                         loc = mCalendar->incidence(inc->uid() );
                         if ( loc ) {
-                            loc->setZaurusId( inc->zaurusId() );
+                            loc->setID(mCurrentSyncDevice, inc->getID(mCurrentSyncDevice) );
                             loc->setZaurusUid( inc->zaurusUid() );
                         }
                     }
@@ -1829,22 +1835,7 @@ void CalendarView::changeTodoDisplay(Todo *which, int action)
 {
     changeIncidenceDisplay((Incidence *)which,  action);
 }
-void CalendarView::checkZaurusId( int id, bool todo )
-{
-    if ( id >= 0 ) { 
-        Incidence* lse = mCalendar->event( "last-syncEvent-Sharp-DTM");
-        if ( lse ) {
-            QString des = lse->description();
-            QString pref = "e";
-            if ( todo )
-                pref = "t";
-            des += pref+ QString::number ( id ) + ",";
-            lse->setReadOnly( false );
-            lse->setDescription( des );
-            lse->setReadOnly( true );
-        }
-    }
-}
+
 void CalendarView::changeIncidenceDisplay(Incidence *which, int action)
 {
     updateUnmanagedViews();
@@ -2576,7 +2567,7 @@ void CalendarView::deleteTodo(Todo *todo)
                 KMessageBox::sorry(this,i18n("Cannot delete To-Do\nwhich has children."),
                                    i18n("Delete To-Do"));
             } else {
-                checkZaurusId(  todo->zaurusId(), true );
+                checkExternalId(  todo );
                 calendar()->deleteTodo(todo);
                 changeTodoDisplay( todo,KOGlobals::EVENTDELETED );
                 updateView();
@@ -2588,7 +2579,7 @@ void CalendarView::deleteTodo(Todo *todo)
             KMessageBox::sorry(this,i18n("Cannot delete To-Do\nwhich has children."),
                                i18n("Delete To-Do"));
         } else {
-            checkZaurusId(  todo->zaurusId(), true );
+            checkExternalId(  todo );
             mCalendar->deleteTodo(todo);
             changeTodoDisplay( todo,KOGlobals::EVENTDELETED );
             updateView();
@@ -2650,7 +2641,7 @@ void CalendarView::deleteEvent(Event *anEvent)
             if (anEvent->organizer()==KOPrefs::instance()->email() && anEvent->attendeeCount()>0)
                 schedule(Scheduler::Cancel,anEvent);
 
-            checkZaurusId( anEvent->zaurusId());
+            checkExternalId( anEvent);
             mCalendar->deleteEvent(anEvent);
             changeEventDisplay(anEvent,KOGlobals::EVENTDELETED);
             break;
@@ -2684,7 +2675,7 @@ void CalendarView::deleteEvent(Event *anEvent)
             case KMessageBox::Continue: // OK
                 if (anEvent->organizer()==KOPrefs::instance()->email() && anEvent->attendeeCount()>0)
                     schedule(Scheduler::Cancel,anEvent);
-                checkZaurusId( anEvent->zaurusId());
+                checkExternalId( anEvent);
                 mCalendar->deleteEvent(anEvent);
                 changeEventDisplay(anEvent, KOGlobals::EVENTDELETED);
                 break;
@@ -2692,7 +2683,7 @@ void CalendarView::deleteEvent(Event *anEvent)
         } else {
             if (anEvent->organizer()==KOPrefs::instance()->email() && anEvent->attendeeCount()>0)
                 schedule(Scheduler::Cancel,anEvent);
-            checkZaurusId( anEvent->zaurusId());
+            checkExternalId( anEvent);
             mCalendar->deleteEvent(anEvent);
             changeEventDisplay(anEvent, KOGlobals::EVENTDELETED);
         }
@@ -3446,7 +3437,7 @@ bool  CalendarView::removeCompletedSubTodos( Todo* t )
     }
     if ( deleteTodo ) {
         if ( t->isCompleted() ) {
-            checkZaurusId(  t->zaurusId(), true );
+            checkExternalId(  t );
             mCalendar->deleteTodo( t );
             changeTodoDisplay( t,KOGlobals::EVENTDELETED );
         }
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 557554f..f7a1213 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -483,7 +483,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     
     QDateTime loadedFileVersion;
     void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete );
-    void checkZaurusId( int id, bool todo = false );
+    void checkExternalId( Incidence * inc );
     int mGlobalSyncMode;
     QString  mCurrentSyncDevice;
     QString  mCurrentSyncName;