-rw-r--r-- | korganizer/mainwindow.cpp | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 7b666d1..de94b8c 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1893,6 +1893,4 @@ QString MainWindow::getPassword( ) | |||
1893 | void MainWindow::enableQuick() | 1893 | void MainWindow::enableQuick() |
1894 | { | 1894 | { |
1895 | QString passWordPiSync = "bhdrvmk"; | ||
1896 | QString retfile = ""; | ||
1897 | QDialog dia ( this, "input-dialog", true ); | 1895 | QDialog dia ( this, "input-dialog", true ); |
1898 | QLineEdit lab ( &dia ); | 1896 | QLineEdit lab ( &dia ); |
@@ -1906,5 +1904,5 @@ void MainWindow::enableQuick() | |||
1906 | 1904 | ||
1907 | QLineEdit lepw ( &dia ); | 1905 | QLineEdit lepw ( &dia ); |
1908 | lepw.setText( "abc" ); | 1906 | lepw.setText( KOPrefs::instance()->mPassiveSyncPw ); |
1909 | QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia ); | 1907 | QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia ); |
1910 | lay.addWidget( &label2); | 1908 | lay.addWidget( &label2); |
@@ -1916,15 +1914,12 @@ void MainWindow::enableQuick() | |||
1916 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); | 1914 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); |
1917 | dia.show(); | 1915 | dia.show(); |
1918 | int res = dia.exec(); | 1916 | if ( ! dia.exec() ) |
1919 | if ( res ) | ||
1920 | retfile = lab.text(); | ||
1921 | else | ||
1922 | return; | 1917 | return; |
1923 | dia.hide(); | 1918 | dia.hide(); |
1924 | passWordPiSync = lepw.text(); | ||
1925 | qApp->processEvents(); | 1919 | qApp->processEvents(); |
1926 | KOPrefs::instance()->mPassiveSyncPort = retfile; | 1920 | KOPrefs::instance()->mPassiveSyncPw = lepw.text(); |
1921 | KOPrefs::instance()->mPassiveSyncPort = lab.text(); | ||
1927 | bool ok; | 1922 | bool ok; |
1928 | Q_UINT16 port = retfile.toUInt(&ok); | 1923 | Q_UINT16 port = KOPrefs::instance()->mPassiveSyncPort.toUInt(&ok); |
1929 | if ( ! ok ) { | 1924 | if ( ! ok ) { |
1930 | KMessageBox::information( this, i18n("No valid port")); | 1925 | KMessageBox::information( this, i18n("No valid port")); |
@@ -1932,9 +1927,9 @@ void MainWindow::enableQuick() | |||
1932 | } | 1927 | } |
1933 | //qDebug("port %d ", port); | 1928 | //qDebug("port %d ", port); |
1934 | mServerSocket = new KServerSocket ( passWordPiSync, port ,1 ); | 1929 | mServerSocket = new KServerSocket ( KOPrefs::instance()->mPassiveSyncPw, port ,1 ); |
1935 | mServerSocket->setFileName( defaultFileName() ); | 1930 | mServerSocket->setFileName( defaultFileName() ); |
1936 | //qDebug("connected "); | 1931 | //qDebug("connected "); |
1937 | if ( !mServerSocket->ok() ) { | 1932 | if ( !mServerSocket->ok() ) { |
1938 | qWarning("Failed to bind to port %d", port); | 1933 | KMessageBox::information( this, i18n("Failed to bind or\nlisten to the port!")); |
1939 | delete mServerSocket; | 1934 | delete mServerSocket; |
1940 | mServerSocket = 0; | 1935 | mServerSocket = 0; |
@@ -2195,4 +2190,5 @@ KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject | |||
2195 | mSocket = 0; | 2190 | mSocket = 0; |
2196 | mSyncActionDialog = 0; | 2191 | mSyncActionDialog = 0; |
2192 | blockRC = false; | ||
2197 | }; | 2193 | }; |
2198 | 2194 | ||
@@ -2222,11 +2218,15 @@ void KServerSocket::discardClient() | |||
2222 | void KServerSocket::readClient() | 2218 | void KServerSocket::readClient() |
2223 | { | 2219 | { |
2220 | if ( blockRC ) | ||
2221 | return; | ||
2224 | if ( mSocket == 0 ) { | 2222 | if ( mSocket == 0 ) { |
2225 | qDebug("ERROR::KServerSocket::readClient(): mSocket == 0 "); | 2223 | qDebug("ERROR::KServerSocket::readClient(): mSocket == 0 "); |
2226 | return; | 2224 | return; |
2227 | } | 2225 | } |
2228 | //qDebug("KServerSocket readClient()"); | 2226 | qDebug("KServerSocket readClient()"); |
2229 | if ( mSocket->canReadLine() ) { | 2227 | if ( mSocket->canReadLine() ) { |
2230 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), mSocket->readLine() ); | 2228 | QString line = mSocket->readLine(); |
2229 | qDebug("KServerSocket readline: %s ", line.latin1()); | ||
2230 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); | ||
2231 | if ( tokens[0] == "GET" ) { | 2231 | if ( tokens[0] == "GET" ) { |
2232 | if ( tokens[1] == mPassWord ) | 2232 | if ( tokens[1] == mPassWord ) |
@@ -2239,7 +2239,9 @@ void KServerSocket::readClient() | |||
2239 | } | 2239 | } |
2240 | if ( tokens[0] == "PUT" ) { | 2240 | if ( tokens[0] == "PUT" ) { |
2241 | if ( tokens[1] == mPassWord ) | 2241 | if ( tokens[1] == mPassWord ) { |
2242 | //emit getFile( mSocket ); | 2242 | //emit getFile( mSocket ); |
2243 | blockRC = true; | ||
2243 | get_file(); | 2244 | get_file(); |
2245 | } | ||
2244 | else { | 2246 | else { |
2245 | KMessageBox::information( 0, i18n("ERROR:\nGot receive file request\nwith invalid password")); | 2247 | KMessageBox::information( 0, i18n("ERROR:\nGot receive file request\nwith invalid password")); |
@@ -2265,5 +2267,5 @@ void KServerSocket::send_file() | |||
2265 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); | 2267 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); |
2266 | mSyncActionDialog->setCaption(i18n("Received sync request")); | 2268 | mSyncActionDialog->setCaption(i18n("Received sync request")); |
2267 | QLabel* label = new QLabel( i18n("Synchronizing...\nDo not use this application!\n\nIf syncing fails you can close this dialog."), mSyncActionDialog ); | 2269 | QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); |
2268 | QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); | 2270 | QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); |
2269 | lay->addWidget( label); | 2271 | lay->addWidget( label); |
@@ -2338,4 +2340,5 @@ void KServerSocket::readBackFileFromSocket() | |||
2338 | piFileString = ""; | 2340 | piFileString = ""; |
2339 | emit file_received( false ); | 2341 | emit file_received( false ); |
2342 | blockRC = false; | ||
2340 | return ; | 2343 | return ; |
2341 | 2344 | ||
@@ -2354,4 +2357,5 @@ void KServerSocket::readBackFileFromSocket() | |||
2354 | mSyncActionDialog = 0; | 2357 | mSyncActionDialog = 0; |
2355 | piFileString = ""; | 2358 | piFileString = ""; |
2359 | blockRC = false; | ||
2356 | emit file_received( true ); | 2360 | emit file_received( true ); |
2357 | 2361 | ||