author | zautrix <zautrix> | 2005-02-24 02:22:48 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-24 02:22:48 (UTC) |
commit | 66ea8a0023a2a58e7887a41c265f2a7112b6b625 (patch) (unidiff) | |
tree | 2533ce5893fc7c68e067964ad078d4b00a6e8354 /libkdepim | |
parent | 5af16f69232073d1fa46d2dea3774beaaafb00c5 (diff) | |
download | kdepimpi-66ea8a0023a2a58e7887a41c265f2a7112b6b625.zip kdepimpi-66ea8a0023a2a58e7887a41c265f2a7112b6b625.tar.gz kdepimpi-66ea8a0023a2a58e7887a41c265f2a7112b6b625.tar.bz2 |
socket fix
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 22 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.h | 2 |
2 files changed, 17 insertions, 7 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) | |||
1074 | 1074 | ||
1075 | 1075 | ||
1076 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW || | 1076 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW || |
1077 | state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN ) { | 1077 | state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) { |
1078 | if ( state == KCommandSocket::errorPW ) | 1078 | if ( state == KCommandSocket::errorPW ) |
1079 | mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") ); | 1079 | mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") ); |
1080 | else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) | 1080 | else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) |
@@ -1083,6 +1083,8 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | |||
1083 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") ); | 1083 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") ); |
1084 | else if ( state == KCommandSocket::errorFI ) | 1084 | else if ( state == KCommandSocket::errorFI ) |
1085 | mParent->topLevelWidget()->setCaption( i18n("File error on remote.") ); | 1085 | mParent->topLevelWidget()->setCaption( i18n("File error on remote.") ); |
1086 | else if ( state == KCommandSocket::errorED ) | ||
1087 | mParent->topLevelWidget()->setCaption( i18n("Please close error dialog on remote.") ); | ||
1086 | else if ( state == KCommandSocket::errorUN ) | 1088 | else if ( state == KCommandSocket::errorUN ) |
1087 | mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") ); | 1089 | mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") ); |
1088 | delete s; | 1090 | delete s; |
@@ -1183,7 +1185,7 @@ void KServerSocket::readClient() | |||
1183 | } | 1185 | } |
1184 | if ( mErrorMessage ) { | 1186 | if ( mErrorMessage ) { |
1185 | mErrorMessage = 999; | 1187 | mErrorMessage = 999; |
1186 | error_connect("ERROR_UN\r\n\r\n"); | 1188 | error_connect("ERROR_ED\r\n\r\n"); |
1187 | return; | 1189 | return; |
1188 | } | 1190 | } |
1189 | mErrorMessage = 0; | 1191 | mErrorMessage = 0; |
@@ -1229,11 +1231,14 @@ void KServerSocket::readClient() | |||
1229 | } | 1231 | } |
1230 | void KServerSocket::displayErrorMessage() | 1232 | void KServerSocket::displayErrorMessage() |
1231 | { | 1233 | { |
1232 | if ( mErrorMessage == 1 ) | 1234 | if ( mErrorMessage == 1 ) { |
1233 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); | 1235 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); |
1234 | else if ( mErrorMessage == 2 ) | 1236 | mErrorMessage = 0; |
1237 | } | ||
1238 | else if ( mErrorMessage == 2 ) { | ||
1235 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); | 1239 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); |
1236 | mErrorMessage = 0; | 1240 | mErrorMessage = 0; |
1241 | } | ||
1237 | } | 1242 | } |
1238 | void KServerSocket::error_connect( QString errmess ) | 1243 | void KServerSocket::error_connect( QString errmess ) |
1239 | { | 1244 | { |
@@ -1265,7 +1270,7 @@ void KServerSocket::send_file() | |||
1265 | lay->setSpacing(7); | 1270 | lay->setSpacing(7); |
1266 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { | 1271 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { |
1267 | int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent ); | 1272 | int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent ); |
1268 | secs = 333; | 1273 | //secs = 333; |
1269 | if ( secs < 0 ) | 1274 | if ( secs < 0 ) |
1270 | secs = secs * (-1); | 1275 | secs = secs * (-1); |
1271 | if ( secs > 30 ) | 1276 | if ( secs > 30 ) |
@@ -1521,6 +1526,11 @@ void KCommandSocket::readFileFromSocket() | |||
1521 | deleteSocket(); | 1526 | deleteSocket(); |
1522 | return ; | 1527 | return ; |
1523 | } | 1528 | } |
1529 | if ( line.left( 8 ) == "ERROR_ED" ) { | ||
1530 | mRetVal = errorED; | ||
1531 | deleteSocket(); | ||
1532 | return ; | ||
1533 | } | ||
1524 | mRetVal = errorUN; | 1534 | mRetVal = errorUN; |
1525 | deleteSocket(); | 1535 | deleteSocket(); |
1526 | return ; | 1536 | return ; |
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index bd3ecdc..30ec1e6 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h | |||
@@ -78,7 +78,7 @@ class KCommandSocket : public QObject | |||
78 | { | 78 | { |
79 | Q_OBJECT | 79 | Q_OBJECT |
80 | public: | 80 | public: |
81 | enum state { successR, errorR, successW, errorW, errorTO, errorPW, errorCA, errorFI, errorUN,quiet }; | 81 | enum state { successR, errorR, successW, errorW, errorTO, errorPW, errorCA, errorFI, errorUN, errorED,quiet }; |
82 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); | 82 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); |
83 | void readFile( QString ); | 83 | void readFile( QString ); |
84 | void writeFile( QString ); | 84 | void writeFile( QString ); |