summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncmanager.cpp22
-rw-r--r--libkdepim/ksyncmanager.h2
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
@@ -1073,17 +1073,19 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
1073 1073
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 )
1081 mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); 1081 mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
1082 else if ( state == KCommandSocket::errorCA ) 1082 else if ( state == KCommandSocket::errorCA )
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;
1089 if ( state == KCommandSocket::errorR ) { 1091 if ( state == KCommandSocket::errorR ) {
@@ -1182,9 +1184,9 @@ void KServerSocket::readClient()
1182 return; 1184 return;
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;
1190 //qDebug("KServerSocket::readClient()"); 1192 //qDebug("KServerSocket::readClient()");
@@ -1228,13 +1230,16 @@ void KServerSocket::readClient()
1228 } 1230 }
1229} 1231}
1230void KServerSocket::displayErrorMessage() 1232void 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}
1238void KServerSocket::error_connect( QString errmess ) 1243void KServerSocket::error_connect( QString errmess )
1239{ 1244{
1240 QTextStream os( mSocket ); 1245 QTextStream os( mSocket );
@@ -1264,9 +1269,9 @@ void KServerSocket::send_file()
1264 lay->setMargin(7); 1269 lay->setMargin(7);
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 )
1272 //if ( true ) 1277 //if ( true )
@@ -1520,8 +1525,13 @@ void KCommandSocket::readFileFromSocket()
1520 mRetVal = errorFI; 1525 mRetVal = errorFI;
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 ;
1527 } 1537 }
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index bd3ecdc..30ec1e6 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -77,9 +77,9 @@ class KServerSocket : public QServerSocket
77class KCommandSocket : public QObject 77class 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 );
85 void sendStop(); 85 void sendStop();