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
@@ -145,9 +145,9 @@ void KSyncManager::fillSyncMenu()
 }
 
 void KSyncManager::slotSyncMenu( int action )
 {
-    //qDebug("syncaction %d ", action);
+    qDebug("syncaction %d ", action);
     if ( action == 0 ) {
 
         // seems to be a Qt2 event handling bug
         // syncmenu.clear causes a segfault at first time
@@ -253,8 +253,12 @@ void KSyncManager::slotSyncMenu( int action )
                     mActiveSyncPort = temp->getRemotePortPWM();
                     mActiveSyncIP = temp->getRemoteIPPWM();
                 } 
                 syncPi();
+                while ( !mPisyncFinished ) {
+                    //qDebug("waiting ");
+                    qApp->processEvents();
+                }
             } else
                 syncRemote( temp );
 
         }
@@ -471,9 +475,13 @@ int KSyncManager::ringSync()
             mShowSyncSummary = false;
             mCurrentSyncDevice = syncProfileNames[i] ;
             mCurrentSyncName = mLocalMachineName;
             if ( i == 0 ) {
+#ifdef DESKTOP_VERSION
+                syncKDE();
+#else
                 syncSharp();
+#endif
             } else {
                 if ( temp->getIsLocalFileSync() ) {
                     switch(mTargetApp)
                         {
@@ -513,8 +521,16 @@ int KSyncManager::ringSync()
                             mActiveSyncPort = temp->getRemotePortPWM();
                             mActiveSyncIP = temp->getRemoteIPPWM();
                         } 
                         syncPi();
+                        while ( !mPisyncFinished ) {
+                            //qDebug("waiting ");
+                            qApp->processEvents();
+                        }
+                        timer.start(); 
+                        while ( timer.elapsed () < 2000 ) {
+                            qApp->processEvents();
+                        }
                     } else
                         syncRemote( temp, false );
 
                 }
@@ -865,8 +881,9 @@ QString KSyncManager::syncFileName()
 }
 
 void KSyncManager::syncPi()
 {
+    mPisyncFinished = false;
     qApp->processEvents();
     if ( mAskForPreferences )
         edit_pisync_options();
     bool ok;
@@ -891,18 +908,21 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
             KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
             connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
             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 ) {
         QTimer::singleShot( 1, this , SLOT ( readFileFromSocket()));
 
     } else  if ( state == KCommandSocket::successW ) {
         mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
+        mPisyncFinished = true;
     }
 
     delete s;
 }
@@ -912,8 +932,9 @@ void KSyncManager::readFileFromSocket()
     QString fileName = syncFileName();
     mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") );
     if ( ! syncWithFile( fileName , true ) ) {
         mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") );
+        mPisyncFinished = true;
         return;
     }
     KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
@@ -921,8 +942,9 @@ void KSyncManager::readFileFromSocket()
         commandSocket->writeFile(  fileName );
     else {
         commandSocket->sendStop();
         mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
+        mPisyncFinished = true;
     }
 }
 
 KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name )