many sync fixes

1 files changed, 23 insertions, 1 deletions

diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 7ee56e4..c6e06f8 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -147,5 +147,5 @@ void KSyncManager::fillSyncMenu()
 void KSyncManager::slotSyncMenu( int action )
 {
-    //qDebug("syncaction %d ", action);
+    qDebug("syncaction %d ", action);
     if ( action == 0 ) {
 
@@ -255,4 +255,8 @@ void KSyncManager::slotSyncMenu( int action )
                 } 
                 syncPi();
+                while ( !mPisyncFinished ) {
+                    //qDebug("waiting ");
+                    qApp->processEvents();
+                }
             } else
                 syncRemote( temp );
@@ -473,5 +477,9 @@ int KSyncManager::ringSync()
             mCurrentSyncName = mLocalMachineName;
             if ( i == 0 ) {
+#ifdef DESKTOP_VERSION
+                syncKDE();
+#else
                 syncSharp();
+#endif
             } else {
                 if ( temp->getIsLocalFileSync() ) {
@@ -515,4 +523,12 @@ int KSyncManager::ringSync()
                         } 
                         syncPi();
+                        while ( !mPisyncFinished ) {
+                            //qDebug("waiting ");
+                            qApp->processEvents();
+                        }
+                        timer.start(); 
+                        while ( timer.elapsed () < 2000 ) {
+                            qApp->processEvents();
+                        }
                     } else
                         syncRemote( temp, false );
@@ -867,4 +883,5 @@ QString KSyncManager::syncFileName()
 void KSyncManager::syncPi()
 {
+    mPisyncFinished = false;
     qApp->processEvents();
     if ( mAskForPreferences )
@@ -893,8 +910,10 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
             commandSocket->sendStop();
         }
+        mPisyncFinished = true;
         return;
         
     } else  if ( state == KCommandSocket::errorW ) {
         mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") );
+        mPisyncFinished = true;
 
     } else  if ( state == KCommandSocket::successR ) {
@@ -903,4 +922,5 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
     } else  if ( state == KCommandSocket::successW ) {
         mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
+        mPisyncFinished = true;
     }
 
@@ -914,4 +934,5 @@ void KSyncManager::readFileFromSocket()
     if ( ! syncWithFile( fileName , true ) ) {
         mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") );
+        mPisyncFinished = true;
         return;
     }
@@ -923,4 +944,5 @@ void KSyncManager::readFileFromSocket()
         commandSocket->sendStop();
         mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
+        mPisyncFinished = true;
     }
 }