summaryrefslogtreecommitdiffabout
path: root/libkdepim/ksyncmanager.cpp
Side-by-side diff
Diffstat (limited to 'libkdepim/ksyncmanager.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncmanager.cpp22
1 files changed, 16 insertions, 6 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 47d00a4..d59f4a4 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1074,7 +1074,7 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW ||
- state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN ) {
+ state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) {
if ( state == KCommandSocket::errorPW )
mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") );
else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO )
@@ -1083,6 +1083,8 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") );
else if ( state == KCommandSocket::errorFI )
mParent->topLevelWidget()->setCaption( i18n("File error on remote.") );
+ else if ( state == KCommandSocket::errorED )
+ mParent->topLevelWidget()->setCaption( i18n("Please close error dialog on remote.") );
else if ( state == KCommandSocket::errorUN )
mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") );
delete s;
@@ -1183,7 +1185,7 @@ void KServerSocket::readClient()
}
if ( mErrorMessage ) {
mErrorMessage = 999;
- error_connect("ERROR_UN\r\n\r\n");
+ error_connect("ERROR_ED\r\n\r\n");
return;
}
mErrorMessage = 0;
@@ -1229,11 +1231,14 @@ void KServerSocket::readClient()
}
void KServerSocket::displayErrorMessage()
{
- if ( mErrorMessage == 1 )
+ if ( mErrorMessage == 1 ) {
KMessageBox::error( 0, i18n("Got send file request\nwith invalid password"));
- else if ( mErrorMessage == 2 )
+ mErrorMessage = 0;
+ }
+ else if ( mErrorMessage == 2 ) {
KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password"));
- mErrorMessage = 0;
+ mErrorMessage = 0;
+ }
}
void KServerSocket::error_connect( QString errmess )
{
@@ -1265,7 +1270,7 @@ void KServerSocket::send_file()
lay->setSpacing(7);
if ( KSyncManager::mRequestedSyncEvent.isValid() ) {
int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent );
- secs = 333;
+ //secs = 333;
if ( secs < 0 )
secs = secs * (-1);
if ( secs > 30 )
@@ -1521,6 +1526,11 @@ void KCommandSocket::readFileFromSocket()
deleteSocket();
return ;
}
+ if ( line.left( 8 ) == "ERROR_ED" ) {
+ mRetVal = errorED;
+ deleteSocket();
+ return ;
+ }
mRetVal = errorUN;
deleteSocket();
return ;