-rw-r--r-- | libkdepim/ksyncmanager.cpp | 26 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.h | 4 |
2 files changed, 27 insertions, 3 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 08a263c..5214fe7 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1071,6 +1071,9 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | |||
1071 | { | 1071 | { |
1072 | //enum { success, errorW, errorR, quiet }; | 1072 | //enum { success, errorW, errorR, quiet }; |
1073 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) { | 1073 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW ) { |
1074 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); | 1074 | if ( state == KCommandSocket::errorPW ) |
1075 | mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") ); | ||
1076 | else | ||
1077 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); | ||
1075 | delete s; | 1078 | delete s; |
1076 | if ( state == KCommandSocket::errorR ) { | 1079 | if ( state == KCommandSocket::errorR ) { |
@@ -1202,4 +1205,13 @@ void KServerSocket::readClient() | |||
1202 | } | 1205 | } |
1203 | } | 1206 | } |
1207 | void KServerSocket::error_connect() | ||
1208 | { | ||
1209 | QTextStream os( mSocket ); | ||
1210 | os.setEncoding( QTextStream::Latin1 ); | ||
1211 | os << "ERROR_PW\r\n\r\n"; | ||
1212 | mSocket->close(); | ||
1213 | if ( mSocket->state() == QSocket::Idle ) | ||
1214 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | ||
1215 | } | ||
1204 | void KServerSocket::end_connect() | 1216 | void KServerSocket::end_connect() |
1205 | { | 1217 | { |
@@ -1352,4 +1364,5 @@ KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, | |||
1352 | mSocket = 0; | 1364 | mSocket = 0; |
1353 | mFirst = false; | 1365 | mFirst = false; |
1366 | mFirstLine = true; | ||
1354 | mPort = port; | 1367 | mPort = port; |
1355 | mHost = host; | 1368 | mHost = host; |
@@ -1449,4 +1462,5 @@ void KCommandSocket::startReadFileFromSocket() | |||
1449 | mFileString = ""; | 1462 | mFileString = ""; |
1450 | mTime.start(); | 1463 | mTime.start(); |
1464 | mFirstLine = true; | ||
1451 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); | 1465 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); |
1452 | 1466 | ||
@@ -1458,4 +1472,12 @@ void KCommandSocket::readFileFromSocket() | |||
1458 | mTime.restart(); | 1472 | mTime.restart(); |
1459 | QString line = mSocket->readLine (); | 1473 | QString line = mSocket->readLine (); |
1474 | if ( mFirstLine ) { | ||
1475 | mFirstLine = false; | ||
1476 | if ( line.left( 8 ) == "ERROR_PW" ) { | ||
1477 | mRetVal = errorPW; | ||
1478 | deleteSocket(); | ||
1479 | return ; | ||
1480 | } | ||
1481 | } | ||
1460 | mFileString += line; | 1482 | mFileString += line; |
1461 | //qDebug("readline: %s ", line.latin1()); | 1483 | //qDebug("readline: %s ", line.latin1()); |
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 09bd1c1..810a515 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h | |||
@@ -63,4 +63,5 @@ class KServerSocket : public QServerSocket | |||
63 | void get_file(); | 63 | void get_file(); |
64 | void end_connect(); | 64 | void end_connect(); |
65 | void error_connect(); | ||
65 | QDialog* mSyncActionDialog; | 66 | QDialog* mSyncActionDialog; |
66 | QSocket* mSocket; | 67 | QSocket* mSocket; |
@@ -75,5 +76,5 @@ class KCommandSocket : public QObject | |||
75 | Q_OBJECT | 76 | Q_OBJECT |
76 | public: | 77 | public: |
77 | enum state { successR, errorR, successW, errorW, errorTO, quiet }; | 78 | enum state { successR, errorR, successW, errorW, errorTO, errorPW,quiet }; |
78 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); | 79 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); |
79 | void readFile( QString ); | 80 | void readFile( QString ); |
@@ -103,4 +104,5 @@ class KCommandSocket : public QObject | |||
103 | QString mFileString; | 104 | QString mFileString; |
104 | bool mFirst; | 105 | bool mFirst; |
106 | bool mFirstLine; | ||
105 | }; | 107 | }; |
106 | 108 | ||