3 files changed, 24 insertions, 4 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index a08f243..326db88 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -897,67 +897,74 @@ void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* t
             eve->setReadOnly( true );
         }
         eve = lastSync.next();
     }
 
 }
 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;
     int addedEvent = 0;
     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();
-    if ( mSyncKDE )
-        remote->resetPilotStat(1);
     mLastCalendarSync = QDateTime::currentDateTime();
+    if ( mSyncKDE ) {
+        remote->resetPilotStat(1);
+        if (  KSyncManager::mRequestedSyncEvent.isValid() ) {
+            mLastCalendarSync = KSyncManager::mRequestedSyncEvent;
+            qDebug("using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() );
+            } else {
+            qDebug("ERROR: KSyncManager::mRequestedSyncEvent has invalid datatime ");
+        }
+    }
     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 || mSyncKDE) {
             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 ( mSyncKDE ) {
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index feb184b..e09050e 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -26,64 +26,67 @@
 
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 
 
 #include "ksyncprofile.h"
 #include "ksyncprefsdialog.h"
 #include "kpimprefs.h"
 #include <kmessagebox.h>
 
 #include <qdir.h>
 #include <qprogressbar.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
 #include <qtimer.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
 #include <qlineedit.h>
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qtextcodec.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 
 #include <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kfiledialog.h>
 
+QDateTime KSyncManager::mRequestedSyncEvent;
+
+
 KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu)
     : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs ),mSyncMenu(syncmenu)
 {
     mServerSocket = 0;
     bar = new QProgressBar ( 1, 0 );
     bar->setCaption ("");
     
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar->sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     if ( mPrefs->mPassiveSyncAutoStart )
       enableQuick( false );
 
 }
 
 KSyncManager::~KSyncManager()
 {
     delete bar;
 }
 
 
 void KSyncManager::fillSyncMenu()
 {
     if ( mSyncMenu->count() )
         mSyncMenu->clear();
     
     mSyncMenu->insertItem( i18n("Configure..."), 0 );
     mSyncMenu->insertSeparator();
@@ -1082,67 +1085,74 @@ void KServerSocket::newConnection ( int socket )
         delete mSocket;
         mSocket = 0;
     }
     mSocket = new QSocket( this );
     connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) );
     connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
     mSocket->setSocket( socket );
 }
 
 void KServerSocket::discardClient()
 {
     //qDebug(" KServerSocket::discardClient()");
     if ( mSocket ) {
         delete mSocket;
         mSocket = 0;
     }
     //emit endConnect();
 }
 void KServerSocket::readClient()
 {
     if ( blockRC )
         return;
     if ( mSocket == 0 ) {
         qDebug("ERROR::KServerSocket::readClient(): mSocket == 0  ");
         return;
     }
     //qDebug("KServerSocket::readClient()");
     if ( mSocket->canReadLine() ) {
         QString line = mSocket->readLine();
         //qDebug("KServerSocket readline: %s ", line.latin1());
         QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line );
         if ( tokens[0] == "GET" ) {
-            if (  tokens[1] == mPassWord )
+            if (  tokens[1] == mPassWord ) {
                 //emit sendFile( mSocket );
+                bool ok = false;
+                QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok);
+                if ( ok )
+                    KSyncManager::mRequestedSyncEvent = dt; 
+                else
+                    KSyncManager::mRequestedSyncEvent = QDateTime();
                 send_file();
+            }
             else {
                 KMessageBox::error( 0, i18n("Got send file request\nwith invalid password"));
                 //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
             }
         } 
         if ( tokens[0] == "PUT" ) {
             if (  tokens[1] == mPassWord ) {
                 //emit getFile( mSocket );
                 blockRC = true;
                 get_file();
             }
             else {
                 KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password"));
                 //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
             }
         } 
         if ( tokens[0] == "STOP" ) {
             //emit endConnect();
             end_connect();
         }
     }
 }
 void KServerSocket::end_connect()
 {
     delete mSyncActionDialog;
     mSyncActionDialog = 0;
 }
 void KServerSocket::send_file()
 {
     //qDebug("MainWindow::sendFile(QSocket* s) ");
     if ( mSyncActionDialog )
         delete mSyncActionDialog;
@@ -1238,65 +1248,67 @@ void KServerSocket::readBackFileFromSocket()
     piFileString = "";
     emit file_received( true );
     delete mSyncActionDialog;
     mSyncActionDialog = 0;
     blockRC = false;
 
 }
 
 KCommandSocket::KCommandSocket (  QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name )
 {
     mPassWord = password;
     mSocket = 0;
     mPort = port;
     mHost = host;
 
     mRetVal = quiet;
     mTimerSocket = new QTimer ( this );
     connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket()  ) );
 }
 void KCommandSocket::readFile( QString fn )
 {
     if ( !mSocket ) {
         mSocket = new QSocket( this );
         connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
         connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
     }
     mFileString = "";
     mFileName = fn;
     mFirst = true;
     mSocket->connectToHost( mHost, mPort ); 
     QTextStream os( mSocket );
     os.setEncoding( QTextStream::Latin1 );
-    os << "GET " << mPassWord << "\r\n";
+
+    QString curDt = KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate );
+    os << "GET " << mPassWord << curDt <<"\r\n";
     mTimerSocket->start( 20000 );
 }
 
 void KCommandSocket::writeFile( QString fileName  )
 {
     if ( !mSocket ) {
         mSocket = new QSocket( this );
         connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
         connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) );
     }
     mFileName = fileName ;
     mSocket->connectToHost( mHost, mPort ); 
 }
 void KCommandSocket::writeFileToSocket()
 {
     QFile file2( mFileName );
     if (!file2.open( IO_ReadOnly ) ) {
         mRetVal= errorW;
         mSocket->close();
         if ( mSocket->state() == QSocket::Idle )
             QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
         return ;
     }  
     QTextStream ts2( &file2 );
     ts2.setEncoding( QTextStream::Latin1 );
     QTextStream os2( mSocket );
     os2.setEncoding( QTextStream::Latin1 );
     os2 << "PUT " << mPassWord << "\r\n";;
     while ( ! ts2.atEnd() ) {
         os2 << ts2.readLine() << "\r\n";
     }
     mRetVal= successW;
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index aa32e28..2af891b 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -117,64 +117,65 @@ class KSyncManager : public QObject
     void multiSync( bool askforPrefs  );
     bool blockSave() { return mBlockSaveFlag; }
     void setBlockSave(bool sa) { mBlockSaveFlag = sa; }
     void setDefaultFileName( QString s) { mDefFileName = s ;}
     QString defaultFileName() { return mDefFileName ;}
     QString syncFileName();
     void enableQuick( bool ask = true);
 
     QString getCurrentSyncDevice() { return mCurrentSyncDevice; }
     QString getCurrentSyncName() { return mCurrentSyncName; }
 
     void showProgressBar(int percentage, QString caption = QString::null, int total=100);
     void hideProgressBar();
     bool isProgressBarCanceled();
 
     // sync stuff
     QString mLocalMachineName;
     QStringList  mExternSyncProfiles;
     QStringList  mSyncProfileNames;
     bool mAskForPreferences;
     bool mShowSyncSummary;
     bool mIsKapiFile;
     bool mWriteBackExistingOnly;
     int mSyncAlgoPrefs;
     bool mWriteBackFile;
     int  mWriteBackInFuture;
     QString mPhoneDevice;
     QString mPhoneConnection;
     QString mPhoneModel;
     QString mPassWordPiSync;
     QString mActiveSyncPort;
     QString mActiveSyncIP ;
+    static QDateTime mRequestedSyncEvent;
 
  signals:
     void save();
     void request_file();
     void getFile( bool );
 
     public slots:
     void slotSyncMenu( int );
     void slotClearMenu( int action );
     void deleteCommandSocket(KCommandSocket*s, int state);
     void readFileFromSocket();
     void fillSyncMenu();
 
  private:
     void syncPi();
     KServerSocket * mServerSocket;
     KPimPrefs* mPrefs;
     QString mDefFileName;
     QString mCurrentSyncDevice;
     QString mCurrentSyncName;
     void quickSyncLocalFile();
     bool syncWithFile( QString fn , bool quick );
     void syncLocalFile();
     void syncPhone();
     void syncSharp();
     void syncKDE();
     bool syncExternalApplication(QString);
     int mCurrentSyncProfile ;
     void syncRemote( KSyncProfile* prof,  bool ask = true);
     bool edit_sync_options();
     bool edit_pisync_options();
     int ringSync();