5 files changed, 42 insertions, 36 deletions

diff --git a/kde2file/caldump/main.cpp b/kde2file/caldump/main.cpp
index 755e792..be1735b 100644
--- a/kde2file/caldump/main.cpp
+++ b/kde2file/caldump/main.cpp
@@ -42,32 +42,33 @@
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
 #include <libkcal/calformat.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcelocal.h>
 #include <libkcal/filestorage.h>
 #include <libkcal/icalformat.h>
 
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qdir.h>
+#include <qapplication.h>
 
 #include <stdlib.h>
 #include <iostream>
 
 using namespace KCal;
 using namespace std;
 
 static const char progName[] = "kdecalendar";
 static const char progDisplay[] = "KDE_Calendar";
 static const char progVersion[] = "33.1/3";
 static const char progDesc[] = "A command line interface to KDE calendars";
 
 
 static KCmdLineOptions options[] =
     {
         { "dump",
@@ -139,86 +140,83 @@ int main( int argc, char *argv[] )
                 else if ( cl->type() == "Event" )
                     localCalendar->addEvent( (Event *) cl );
             }
         }
   
         FileStorage* storage = new FileStorage( calendarResource );
         storage->setFileName( fileName );
         storage->setSaveFormat( new ICalFormat() );
         storage->save();
         delete storage;
         qDebug("************************************* ");
         qDebug("************kdecaldump*************** ");
         qDebug("************************************* ");
         qDebug("%d calendar entries dumped to file %s", num, fileName.latin1());
 
     } else {
-        qDebug("*************************load");
+        qDebug("************load");
         localCalendar = new CalendarLocal();
         localCalendar->setTimeZoneId( calendarResource->timeZoneId());
         FileStorage* storage = new FileStorage( localCalendar );
         storage->setFileName( fileName );
         int num = 0;
         int del = 0;
         int add = 0;
         if ( storage->load() ) {
-            qDebug("*************************loaded!");
+            qDebug("***********loaded!");
             KCal::Incidence::List  newInc = localCalendar->rawIncidences();
             Incidence::List::ConstIterator it;
             for( it = newInc.begin(); it != newInc.end(); ++it ) {
-                if ( (*it)->pilotId() > 0 ) { //changed
-                    Incidence* cl = (*it)->clone();
-                    Incidence *incOld = calendarResource->incidence( cl->uid() );
+                if ( (*it)->pilotId() > 1 ) { //changed
+                    qDebug("*********pilot id %d %s ",(*it)->pilotId() ,(*it)->summary().latin1());
+                    Incidence *incOld = calendarResource->incidence( (*it)->uid() );
                     ResourceCalendar * res = 0;
                     if ( incOld )
                         res = calendarResource->resource( incOld );
                     if ( res ) {
+                        Incidence* cl = (*it)->clone();
                         cl->setPilotId( incOld->pilotId() );
                         ++num;
                         if ( incOld->type() == "Journal" )
                             calendarResource->deleteJournal( (Journal *) incOld  );
                         else if ( incOld->type() == "Todo" )
                             calendarResource->deleteTodo( (Todo *) incOld );
                         else if ( incOld->type() == "Event" )
                             calendarResource->deleteEvent( (Event *) incOld );
-                    
+                        qDebug("*********change incidence %s ",cl->summary().latin1());
                         if ( cl->type() == "Journal" )
                             calendarResource->addJournal( (Journal *) cl, res  );
                         else if ( cl->type() == "Todo" )
                             calendarResource->addTodo( (Todo *) cl, res  );
                         else if ( cl->type() == "Event" )
                             calendarResource->addEvent( (Event *) cl, res  );
 
                     } else {
-                        if ( incOld ) {
-                            qDebug("ERROR: no resource found for old incidence "); 
-                            if ( incOld->type() == "Journal" )
-                                calendarResource->deleteJournal( (Journal *) incOld  );
-                            else if ( incOld->type() == "Todo" )
-                                calendarResource->deleteTodo( (Todo *) incOld );
-                            else if ( incOld->type() == "Event" )
-                                calendarResource->deleteEvent( (Event *) incOld );
-                        
-                        }
+                        Incidence* cl = (*it)->clone();
+                        qDebug("*********add incidence %s ",cl->summary().latin1());
+                        calendarResource->addIncidence( cl );
+                        ++add;
+                    }
+                } else { // maybe added
+                    Incidence *incOld = calendarResource->incidence( (*it)->uid() );
+                    if ( !incOld ) { //added
+                        Incidence* cl = (*it)->clone();
+                        qDebug("*********add incidence %s ",cl->summary().latin1());
                         calendarResource->addIncidence( cl );
                         ++add;
                     }
-                } else { // added
-                    Incidence* cl = (*it)->clone();
-                    calendarResource->addIncidence( cl );
-                    ++add;
                 }
             }
             KCal::Incidence::List  allInc = calendarResource->rawIncidences();
                 
             for( it = allInc.begin(); it != allInc.end(); ++it ) {
                 ResourceCalendar * re = calendarResource->resource( (*it) );
                 if ( re && !re->readOnly() ) {
                     Incidence* cl = localCalendar->incidence( (*it)->uid() );
                     if ( !cl ) {
                         ++del;  
                         cl = (*it);
                         if ( cl->type() == "Journal" )
                             calendarResource->deleteJournal( (Journal *) cl  );
                         else if ( cl->type() == "Todo" )
                             calendarResource->deleteTodo( (Todo *) cl );
                         else if ( cl->type() == "Event" )
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index f727cd4..ff1db2c 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -744,33 +744,33 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
                 lastSync = localMod.addDays( -1 );
                 if ( !remCh )
                     remoteMod = ( lastSync.addDays( -1 ) );
             } else {
                 //qDebug(" not loc changed ");
                 lastSync = localMod.addDays( 1 );
                 if ( remCh )
                     remoteMod =( lastSync.addDays( 1 ) );
                 
             }
         }
         full = true;  
         if ( mode < SYNC_PREF_ASK )
             mode = SYNC_PREF_ASK;
     } else {
           if ( localMod == remoteMod )
-            if ( local->revision() == remote->revision() )
+              // if ( local->revision() == remote->revision() )
                 return 0;
         
     }
     // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() );
 
     //qDebug("%s %d  %s %d", localMod.toString().latin1() , local->revision(), remoteMod.toString().latin1(), remote->revision());  
     //qDebug("%d %d %d %d ", localMod.time().second(), localMod.time().msec(),  remoteMod.time().second(), remoteMod.time().msec() );
     //full = true; //debug only
     if ( full ) {
         bool equ = false;
         if ( local->type() == "Event" ) {
             equ =  (*((Event*) local) == *((Event*) remote));
         }
         else if ( local->type() =="Todo" )
             equ =  (*((Todo*) local) == (*(Todo*) remote));
         else if ( local->type() =="Journal" )
@@ -919,70 +919,67 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     int addedEventR = 0;
     int deletedEventR = 0;
     int deletedEventL = 0;
     int changedLocal = 0;
     int changedRemote = 0;
     //QPtrList<Event> el = local->rawEvents(); 
     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();
-#ifdef DESKTOP_VERSION
-    //Needed for KDE - OL sync
-    local->resetPilotStat();
-    remote->resetPilotStat();
-#endif
+    if ( mSyncKDE )
+        remote->resetPilotStat(1);
     mLastCalendarSync = QDateTime::currentDateTime();
     QDateTime modifiedCalendar = mLastCalendarSync;;
     eventLSync = getLastSyncEvent();
     eventR = remote->event("last-syncEvent-"+mCurrentSyncName );
     if ( eventR ) {
         eventRSync = (Event*) eventR->clone();
         remote->deleteEvent(eventR );
 
     } else {
         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") );
         }
     }
     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 )
+    if ( fullDateRange && !mSyncKDE )
         mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365);
     else
         mLastCalendarSync = eventLSync->dtStart();
     // for resyncing if own file has changed
     if ( mCurrentSyncDevice == "deleteaftersync" ) {
         mLastCalendarSync = loadedFileVersion;
         qDebug("setting mLastCalendarSync ");
     }
     //qDebug("*************************** ");
     qDebug("mLastCalendarSync %s ",mLastCalendarSync.toString().latin1() );
     QPtrList<Incidence> er = remote->rawIncidences(); 
     Incidence* inR = er.first();
     Incidence* inL;
     QProgressBar bar( er.count(),0 );
     bar.setCaption (i18n("Syncing - close to abort!") );
     
@@ -1018,42 +1015,44 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                     //qDebug("take %d %s ", take, inL->summary().latin1());
                     if ( take == 3 )
                         return false;
                     if ( take == 1  ) {// take local
                         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 );
-#ifdef DESKTOP_VERSION
-                        inR->setPilotId( 1 );
-#endif
+                        if ( mSyncKDE )
+                            inR->setPilotId( 2 );
                         ++changedRemote;
                     } else {
                         if ( inR->revision() < maxrev )
                             inR->setRevision( maxrev );
                         idS = inL->IDStr();
+                        int pid = inL->pilotId();
                         local->deleteIncidence( inL );
                         inL = inR->clone();
+                        if ( mSyncKDE )
+                            inL->setPilotId( pid  );
                         inL->setIDStr( idS );
                         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                             inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
                             inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) );
                         }
                         local->addIncidence(  inL  );
                         ++changedLocal;
                     }
                 }
             } else { //  no conflict
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     QString des = eventLSync->description(); 
                     QString pref = "e";
                     if ( inR->type() == "Todo" )
                         pref = "t";
                     if ( des.find(pref+ inR->getID(mCurrentSyncDevice)  +"," ) >= 0 && mode != 5) { // delete it
@@ -1168,34 +1167,36 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                 remote->deleteIncidence( inR );
                 ++delFut;
             }
             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)
+    if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL && !mSyncKDE) // kde is abnormal...
         remote->addEvent( eventRSync );
+    else
+        delete eventRSync;
     QString mes;
     mes .sprintf(  i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR ); 
     QString delmess;
     if ( delFut  ) {
         delmess.sprintf(  i18n("%d items skipped on remote,\nbecause they are in the past or\nmore than %d weeks in the future.\nAfter skipping, remote has\n%d calendar/todo items."), delFut,mSyncManager->mWriteBackInFuture, remRem-delFut); 
         mes += delmess;
     }
     if ( mSyncManager->mShowSyncSummary ) {
         KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") );
     }
     qDebug( mes );
     mCalendar->checkAlarmForIncidence( 0, true );
     return syncOK;
 }
 
 void CalendarView::setSyncDevice( QString s )
@@ -3721,36 +3722,42 @@ NavigatorBar *CalendarView::navigatorBar()
 {
     return mNavigatorBar;
 }
 
 
 
 void CalendarView::keyPressEvent ( QKeyEvent *e) 
 {
     //qDebug(" alendarView::keyPressEvent ");
     e->ignore();
 }
 
 
 bool CalendarView::sync(KSyncManager* manager, QString filename, int mode)
 {
     // mSyncManager = manager;
+    mSyncKDE = false;
+    if ( filename == QDir::homeDirPath ()+"/.kdecalendardump.ics" ) {
+        qDebug("SyncKDE request detected!");
+        mSyncKDE = true;
+    }
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
     mCurrentSyncName = mSyncManager->getCurrentSyncName();
     return syncCalendar( filename, mode );
 }
 bool CalendarView::syncExternal(KSyncManager* manager, QString resource)
 {
+    mSyncKDE = false;
     //mSyncManager = manager;
     mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
     mCurrentSyncName = mSyncManager->getCurrentSyncName();
     if ( resource == "sharp" )
         syncExternal( 0 );
     if ( resource == "phone" )
          syncExternal( 1 );  
     // pending setmodified
     return true;
 }
 void CalendarView::setSyncManager(KSyncManager* manager)
 {
    mSyncManager = manager;
 }
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 9f56cc8..1cd896d 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -474,32 +474,33 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
      */
     void adaptNavigationUnits();
     bool synchronizeCalendar( Calendar* local,  Calendar* remote, int mode );
     int  takeEvent( Incidence* local,  Incidence* remote, int mode, bool full = false );
     //Attendee* getYourAttendee(Event *event);
   protected:
     void schedule(Scheduler::Method, Incidence *incidence = 0);
     
     // returns KMsgBox::OKCandel()
     int msgItemDelete();
     void showEventEditor();
     void showTodoEditor();
     void writeLocale();
     Todo *selectedTodo();
 
   private:
+    bool mSyncKDE;
     KSyncManager* mSyncManager;
     AlarmDialog * mAlarmDialog;
     QString mAlarmNotification;
     QString mSuspendAlarmNotification;
     QTimer* mSuspendTimer;
     QTimer* mAlarmTimer;
     QTimer* mRecheckAlarmTimer;
     void computeAlarm( QString );
     void startAlarm( QString, QString );
     void setSyncEventsReadOnly();
     
     QDateTime loadedFileVersion;
     void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete );
     void checkExternalId( Incidence * inc );
     int mGlobalSyncMode;
     QString  mCurrentSyncDevice;
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index eeb5f48..52daaaa 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -236,46 +236,46 @@ QPtrList<Incidence> Calendar::incidences()
   QPtrList<Incidence> incidences;
   
   Incidence *i;
 
   QPtrList<Event> e = events();
   for( i = e.first(); i; i = e.next() ) incidences.append( i );
 
   QPtrList<Todo> t = todos();
   for( i = t.first(); i; i = t.next() ) incidences.append( i );
 
   QPtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) incidences.append( i );
 
   return incidences;
 }
 
-void Calendar::resetPilotStat()
+void Calendar::resetPilotStat(int id )
 {
  QPtrList<Incidence> incidences;
   
   Incidence *i;
 
   QPtrList<Event> e = rawEvents();
-  for( i = e.first(); i; i = e.next() ) i->setPilotId( 0 );
+  for( i = e.first(); i; i = e.next() ) i->setPilotId( id );
 
   QPtrList<Todo> t = rawTodos();
-  for( i = t.first(); i; i = t.next() ) i->setPilotId( 0 );
+  for( i = t.first(); i; i = t.next() ) i->setPilotId( id );
 
   QPtrList<Journal> j = journals();
-  for( i = j.first(); i; i = j.next() ) i->setPilotId( 0 );
+  for( i = j.first(); i; i = j.next() ) i->setPilotId( id );
 }
 void Calendar::resetTempSyncStat()
 {
  QPtrList<Incidence> incidences;
   
   Incidence *i;
 
   QPtrList<Event> e = rawEvents();
   for( i = e.first(); i; i = e.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 
   QPtrList<Todo> t = rawTodos();
   for( i = t.first(); i; i = t.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 
   QPtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 }
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index d5294eb..b801186 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -54,33 +54,33 @@ namespace KCal {
   Calendar by addEvent() it is owned by the Calendar object. The Calendar takes
   care of deleting it. All Events returned by the query functions are returned
   as pointers, that means all changes to the returned events are immediately
   visible in the Calendar. You shouldn't delete any Event object you get from
   Calendar.
 */
 class Calendar : public QObject, public CustomProperties,
                  public IncidenceBase::Observer
 {
     Q_OBJECT
 public:
     Calendar();
     Calendar(const QString &timeZoneId);
     virtual ~Calendar();
     void deleteIncidence(Incidence *in);
     void resetTempSyncStat();
-    void resetPilotStat();
+    void resetPilotStat(int id);
     /**
       Clears out the current calendar, freeing all used memory etc.
     */
     virtual void close() = 0;
   
     /**
       Sync changes in memory to persistant storage.
     */
     virtual void save() = 0;
     virtual QPtrList<Event> getExternLastSyncEvents() = 0;
     virtual bool isSaving() { return false; }
 
     /**
       Return the owner of the calendar's full name.
     */
     const QString &getOwner() const;