added external time for pisync - kdesync

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
@@ -928,5 +928,12 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     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;;
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index feb184b..e09050e 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -57,2 +57,5 @@
 
+QDateTime KSyncManager::mRequestedSyncEvent;
+
+
 KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu)
@@ -1113,5 +1116,12 @@ void KServerSocket::readClient()
         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 {
@@ -1269,3 +1279,5 @@ void KCommandSocket::readFile( QString fn )
     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 );
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index aa32e28..2af891b 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -148,2 +148,3 @@ class KSyncManager : public QObject
     QString mActiveSyncIP ;
+    static QDateTime mRequestedSyncEvent;