-rw-r--r-- | korganizer/mainwindow.cpp | 32 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 1 |
2 files changed, 19 insertions, 14 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index ebe761a..2e6b5c8 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -74,4 +74,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
74 | #endif | 74 | #endif |
75 | mCommandSocket = 0; | 75 | mCommandSocket = 0; |
76 | mCommandSocketFinish = 0; | ||
76 | mSyncActionDialog = 0; | 77 | mSyncActionDialog = 0; |
77 | mServerSocket = 0; | 78 | mServerSocket = 0; |
@@ -1982,5 +1983,4 @@ void MainWindow::getFile(QSocket* socket) | |||
1982 | { | 1983 | { |
1983 | setCaption( i18n("Receiving synced file...") ); | 1984 | setCaption( i18n("Receiving synced file...") ); |
1984 | qDebug("MainWindow::sendFile(QSocket* s) "); | ||
1985 | 1985 | ||
1986 | QString fileName = defaultFileName(); | 1986 | QString fileName = defaultFileName(); |
@@ -2069,8 +2069,10 @@ void MainWindow::performQuickQuick() | |||
2069 | return; | 2069 | return; |
2070 | } | 2070 | } |
2071 | if ( mCommandSocket ) | 2071 | if ( !mCommandSocket ) { |
2072 | delete mCommandSocket; | 2072 | mCommandSocket = new QSocket( this ); |
2073 | mCommandSocket = new QSocket( this ); | 2073 | // delete mCommandSocket; |
2074 | connect( mCommandSocket, SIGNAL(readyRead()), this, SLOT(readFileFromSocket()) ); | 2074 | //mCommandSocket = new QSocket( this ); |
2075 | connect( mCommandSocket, SIGNAL(readyRead()), this, SLOT(readFileFromSocket()) ); | ||
2076 | } | ||
2075 | QString host = KOPrefs::instance()->mActiveSyncIP; | 2077 | QString host = KOPrefs::instance()->mActiveSyncIP; |
2076 | mCommandSocket->connectToHost( host, port ); | 2078 | mCommandSocket->connectToHost( host, port ); |
@@ -2113,7 +2115,7 @@ QString fileName; | |||
2113 | file.close(); | 2115 | file.close(); |
2114 | mCommandSocket->close(); | 2116 | mCommandSocket->close(); |
2115 | delete mCommandSocket; | 2117 | //delete mCommandSocket; |
2116 | setCaption( i18n("Remote file saved to temp file.") ); | 2118 | setCaption( i18n("Remote file saved to temp file.") ); |
2117 | mCommandSocket = 0; | 2119 | //mCommandSocket = 0; |
2118 | mCurrentSyncProfile = 2 ; // last file | 2120 | mCurrentSyncProfile = 2 ; // last file |
2119 | mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] ); | 2121 | mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] ); |
@@ -2139,8 +2141,10 @@ QString fileName; | |||
2139 | } | 2141 | } |
2140 | 2142 | ||
2141 | mCommandSocket = new QSocket( this ); | 2143 | if ( !mCommandSocketFinish ) { |
2142 | QString host = KOPrefs::instance()->mActiveSyncIP; | 2144 | mCommandSocketFinish = new QSocket( this ); |
2143 | mCommandSocket->connectToHost( KOPrefs::instance()->mActiveSyncIP, KOPrefs::instance()->mActiveSyncPort.toUInt() ); | 2145 | } |
2146 | mCommandSocketFinish->connectToHost( KOPrefs::instance()->mActiveSyncIP, KOPrefs::instance()->mActiveSyncPort.toUInt() ); | ||
2144 | 2147 | ||
2148 | QString host = KOPrefs::instance()->mActiveSyncIP; | ||
2145 | QFile file2( fileName ); | 2149 | QFile file2( fileName ); |
2146 | if (!file2.open( IO_ReadOnly ) ) { | 2150 | if (!file2.open( IO_ReadOnly ) ) { |
@@ -2153,5 +2157,5 @@ QString fileName; | |||
2153 | QTextStream ts2( &file2 ); | 2157 | QTextStream ts2( &file2 ); |
2154 | ts2.setCodec( QTextCodec::codecForName("utf8") ); | 2158 | ts2.setCodec( QTextCodec::codecForName("utf8") ); |
2155 | QTextStream os2( mCommandSocket ); | 2159 | QTextStream os2( mCommandSocketFinish ); |
2156 | os2.setCodec( QTextCodec::codecForName("utf8") ); | 2160 | os2.setCodec( QTextCodec::codecForName("utf8") ); |
2157 | //os.setEncoding( QTextStream::UnicodeUTF8 ); | 2161 | //os.setEncoding( QTextStream::UnicodeUTF8 ); |
@@ -2164,8 +2168,8 @@ QString fileName; | |||
2164 | os2 << "STOP\r\n"; | 2168 | os2 << "STOP\r\n"; |
2165 | } | 2169 | } |
2166 | mCommandSocket->close(); | 2170 | mCommandSocketFinish->close(); |
2167 | file.close(); | 2171 | file.close(); |
2168 | delete mCommandSocket; | 2172 | //delete ( mCommandSocket); |
2169 | mCommandSocket = 0; | 2173 | //mCommandSocket = 0; |
2170 | qDebug("Syncing succesful! "); | 2174 | qDebug("Syncing succesful! "); |
2171 | setCaption( i18n("Easy-Pi-Sync succesful!") ); | 2175 | setCaption( i18n("Easy-Pi-Sync succesful!") ); |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 9bb2302..5985d56 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -148,4 +148,5 @@ class MainWindow : public QMainWindow | |||
148 | private: | 148 | private: |
149 | QSocket* mCommandSocket; | 149 | QSocket* mCommandSocket; |
150 | QSocket* mCommandSocketFinish; | ||
150 | KServerSocket * mServerSocket; | 151 | KServerSocket * mServerSocket; |
151 | bool mClosed; | 152 | bool mClosed; |