summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncmanager.cpp26
-rw-r--r--libkdepim/ksyncmanager.h4
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
@@ -1072,4 +1072,7 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
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;
@@ -1203,2 +1206,11 @@ void KServerSocket::readClient()
1203} 1206}
1207void 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}
1204void KServerSocket::end_connect() 1216void KServerSocket::end_connect()
@@ -1353,2 +1365,3 @@ KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host,
1353 mFirst = false; 1365 mFirst = false;
1366 mFirstLine = true;
1354 mPort = port; 1367 mPort = port;
@@ -1450,2 +1463,3 @@ void KCommandSocket::startReadFileFromSocket()
1450 mTime.start(); 1463 mTime.start();
1464 mFirstLine = true;
1451 QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); 1465 QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) ));
@@ -1459,2 +1473,10 @@ void KCommandSocket::readFileFromSocket()
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;
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 09bd1c1..810a515 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -64,2 +64,3 @@ class KServerSocket : public QServerSocket
64 void end_connect(); 64 void end_connect();
65 void error_connect();
65 QDialog* mSyncActionDialog; 66 QDialog* mSyncActionDialog;
@@ -76,3 +77,3 @@ class KCommandSocket : public QObject
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 );
@@ -104,2 +105,3 @@ class KCommandSocket : public QObject
104 bool mFirst; 105 bool mFirst;
106 bool mFirstLine;
105}; 107};