summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-24 02:22:48 (UTC)
committer zautrix <zautrix>2005-02-24 02:22:48 (UTC)
commit66ea8a0023a2a58e7887a41c265f2a7112b6b625 (patch) (side-by-side diff)
tree2533ce5893fc7c68e067964ad078d4b00a6e8354
parent5af16f69232073d1fa46d2dea3774beaaafb00c5 (diff)
downloadkdepimpi-66ea8a0023a2a58e7887a41c265f2a7112b6b625.zip
kdepimpi-66ea8a0023a2a58e7887a41c265f2a7112b6b625.tar.gz
kdepimpi-66ea8a0023a2a58e7887a41c265f2a7112b6b625.tar.bz2
socket fix
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libkdepim/ksyncmanager.cpp20
-rw-r--r--libkdepim/ksyncmanager.h2
2 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
@@ -1076,3 +1076,3 @@ 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 )
@@ -1085,2 +1085,4 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
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 )
@@ -1185,3 +1187,3 @@ void KServerSocket::readClient()
mErrorMessage = 999;
- error_connect("ERROR_UN\r\n\r\n");
+ error_connect("ERROR_ED\r\n\r\n");
return;
@@ -1231,5 +1233,7 @@ 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"));
@@ -1237,2 +1241,3 @@ void KServerSocket::displayErrorMessage()
}
+}
void KServerSocket::error_connect( QString errmess )
@@ -1267,3 +1272,3 @@ void KServerSocket::send_file()
int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent );
- secs = 333;
+ //secs = 333;
if ( secs < 0 )
@@ -1523,2 +1528,7 @@ void KCommandSocket::readFileFromSocket()
}
+ if ( line.left( 8 ) == "ERROR_ED" ) {
+ mRetVal = errorED;
+ deleteSocket();
+ return ;
+ }
mRetVal = errorUN;
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index bd3ecdc..30ec1e6 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -80,3 +80,3 @@ class KCommandSocket : public QObject
public:
- enum state { successR, errorR, successW, errorW, errorTO, errorPW, errorCA, errorFI, errorUN,quiet };
+ enum state { successR, errorR, successW, errorW, errorTO, errorPW, errorCA, errorFI, errorUN, errorED,quiet };
KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 );