summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncmanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index df53235..6baa2ee 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -982,25 +982,25 @@ void KServerSocket::send_file()
982 if ( mSocket->state() == QSocket::Idle ) 982 if ( mSocket->state() == QSocket::Idle )
983 QTimer::singleShot( 10, this , SLOT ( discardClient())); 983 QTimer::singleShot( 10, this , SLOT ( discardClient()));
984 return ; 984 return ;
985 985
986 } 986 }
987 mSyncActionDialog->setCaption( i18n("Sending file...") ); 987 mSyncActionDialog->setCaption( i18n("Sending file...") );
988 QTextStream ts( &file ); 988 QTextStream ts( &file );
989 ts.setEncoding( QTextStream::Latin1 ); 989 ts.setEncoding( QTextStream::Latin1 );
990 990
991 QTextStream os( mSocket ); 991 QTextStream os( mSocket );
992 os.setEncoding( QTextStream::Latin1 ); 992 os.setEncoding( QTextStream::Latin1 );
993 while ( ! ts.atEnd() ) { 993 while ( ! ts.atEnd() ) {
994 os << ts.readLine() << "\n"; 994 os << ts.readLine() << "\r\n";
995 } 995 }
996 //os << ts.read(); 996 //os << ts.read();
997 file.close(); 997 file.close();
998 mSyncActionDialog->setCaption( i18n("Waiting for synced file...") ); 998 mSyncActionDialog->setCaption( i18n("Waiting for synced file...") );
999 mSocket->close(); 999 mSocket->close();
1000 if ( mSocket->state() == QSocket::Idle ) 1000 if ( mSocket->state() == QSocket::Idle )
1001 QTimer::singleShot( 10, this , SLOT ( discardClient())); 1001 QTimer::singleShot( 10, this , SLOT ( discardClient()));
1002} 1002}
1003void KServerSocket::get_file() 1003void KServerSocket::get_file()
1004{ 1004{
1005 mSyncActionDialog->setCaption( i18n("Receiving synced file...") ); 1005 mSyncActionDialog->setCaption( i18n("Receiving synced file...") );
1006 1006
@@ -1102,25 +1102,25 @@ void KCommandSocket::writeFileToSocket()
1102 mRetVal= errorW; 1102 mRetVal= errorW;
1103 mSocket->close(); 1103 mSocket->close();
1104 if ( mSocket->state() == QSocket::Idle ) 1104 if ( mSocket->state() == QSocket::Idle )
1105 QTimer::singleShot( 10, this , SLOT ( deleteSocket())); 1105 QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
1106 return ; 1106 return ;
1107 } 1107 }
1108 QTextStream ts2( &file2 ); 1108 QTextStream ts2( &file2 );
1109 ts2.setEncoding( QTextStream::Latin1 ); 1109 ts2.setEncoding( QTextStream::Latin1 );
1110 QTextStream os2( mSocket ); 1110 QTextStream os2( mSocket );
1111 os2.setEncoding( QTextStream::Latin1 ); 1111 os2.setEncoding( QTextStream::Latin1 );
1112 os2 << "PUT " << mPassWord << "\r\n";; 1112 os2 << "PUT " << mPassWord << "\r\n";;
1113 while ( ! ts2.atEnd() ) { 1113 while ( ! ts2.atEnd() ) {
1114 os2 << ts2.readLine() << "\n"; 1114 os2 << ts2.readLine() << "\r\n";
1115 } 1115 }
1116 mRetVal= successW; 1116 mRetVal= successW;
1117 file2.close(); 1117 file2.close();
1118 mSocket->close(); 1118 mSocket->close();
1119 if ( mSocket->state() == QSocket::Idle ) 1119 if ( mSocket->state() == QSocket::Idle )
1120 QTimer::singleShot( 10, this , SLOT ( deleteSocket())); 1120 QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
1121} 1121}
1122void KCommandSocket::sendStop() 1122void KCommandSocket::sendStop()
1123{ 1123{
1124 if ( !mSocket ) { 1124 if ( !mSocket ) {
1125 mSocket = new QSocket( this ); 1125 mSocket = new QSocket( this );
1126 connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); 1126 connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );