-rw-r--r-- | libkdepim/ksyncmanager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 7197b30..b7929ec 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1173,32 +1173,33 @@ void KSyncManager::syncPi() | |||
1173 | qApp->processEvents(); | 1173 | qApp->processEvents(); |
1174 | } | 1174 | } |
1175 | if ( startLocal+1 < mSpecificResources.count()/2 ) { | 1175 | if ( startLocal+1 < mSpecificResources.count()/2 ) { |
1176 | mParent->topLevelWidget()->setCaption( i18n("Waiting a second before syncing next resource...") ); | 1176 | mParent->topLevelWidget()->setCaption( i18n("Waiting a second before syncing next resource...") ); |
1177 | QTime timer; | 1177 | QTime timer; |
1178 | timer.start(); | 1178 | timer.start(); |
1179 | while ( timer.elapsed () < 1000 ) { | 1179 | while ( timer.elapsed () < 1000 ) { |
1180 | qApp->processEvents(); | 1180 | qApp->processEvents(); |
1181 | } | 1181 | } |
1182 | } | 1182 | } |
1183 | } | 1183 | } |
1184 | ++startRemote; | 1184 | ++startRemote; |
1185 | ++startLocal; | 1185 | ++startLocal; |
1186 | mAskForPreferences = false; | 1186 | mAskForPreferences = false; |
1187 | } | 1187 | } |
1188 | mPisyncFinished = true; | 1188 | mPisyncFinished = true; |
1189 | mParent->topLevelWidget()->setCaption( i18n("Multi-resource Pi-sync finished") ); | ||
1189 | } else { | 1190 | } else { |
1190 | KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); | 1191 | KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); |
1191 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 1192 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
1192 | commandSocket->readFile( syncFileName() ); | 1193 | commandSocket->readFile( syncFileName() ); |
1193 | } | 1194 | } |
1194 | } | 1195 | } |
1195 | 1196 | ||
1196 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | 1197 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) |
1197 | { | 1198 | { |
1198 | //enum { success, errorW, errorR, quiet }; | 1199 | //enum { success, errorW, errorR, quiet }; |
1199 | 1200 | ||
1200 | 1201 | ||
1201 | 1202 | ||
1202 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW || | 1203 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW || |
1203 | state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) { | 1204 | state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) { |
1204 | if ( state == KCommandSocket::errorPW ) | 1205 | if ( state == KCommandSocket::errorPW ) |