diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-02-19 04:51:28 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-02-19 04:51:28 +0100 |
| commit | 810c0bcbd090b3f84a1fb9370ede83301d6f9f75 (patch) | |
| tree | ed105e1bf56f5d444de259544e63f2e4417f1de4 | |
| parent | e469cf99a7d1127b925c81deb4b7ca2e52be00c0 (diff) | |
| download | kvpnc-810c0bcbd090b3f84a1fb9370ede83301d6f9f75.tar.gz kvpnc-810c0bcbd090b3f84a1fb9370ede83301d6f9f75.zip | |
Fix unintended rename of many various *klist*
| -rw-r--r-- | src/kvpnc.cpp | 16 | ||||
| -rw-r--r-- | src/kvpnc.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp index 6d89b27..898b6ff 100644 --- a/src/kvpnc.cpp +++ b/src/kvpnc.cpp @@ -13992,7 +13992,7 @@ void KVpnc::readFromStderr_ipsecwhack() } } -void KVpnc::readFromStdout_ipsecwhactdelisten() +void KVpnc::readFromStdout_ipsecwhacklisten() { if ( IpsecWhackListenProcess == 0 || IpsecGotError ) return; @@ -14142,7 +14142,7 @@ void KVpnc::readFromStdout_ipsecwhactdelisten() } } -void KVpnc::readFromStderr_ipsecwhactdelisten() +void KVpnc::readFromStderr_ipsecwhacklisten() { bool abort = false; if ( IpsecWhackListenProcess ==0 || IpsecGotError ) @@ -14168,8 +14168,8 @@ void KVpnc::readFromStderr_ipsecwhactdelisten() else { // we have to give some time to sleep and try again... - connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhactdelisten() ) ); - connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhactdelisten() ) ); + connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) ); + connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) ); IpsecWhackListenProcess->tryTerminate(); sleep ( 2 ); if ( IpsecWhackListenProcess->isRunning() ) @@ -21416,13 +21416,13 @@ void KVpnc::ipsecStarted() IpsecWhackListenProcess->addArgument ( "whack" ); IpsecWhackListenProcess->addArgument ( "--listen" ); - connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhactdelisten() ) ); - connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhactdelisten() ) ); + connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) ); + connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) ); if ( !IpsecWhackListenProcess->start ( env ) ) { - disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhactdelisten() ) ); - disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhactdelisten() ) ); + disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) ); + disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) ); delete IpsecWhackListenProcess; IpsecWhackListenProcess=0L; KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --listen" ) ); diff --git a/src/kvpnc.h b/src/kvpnc.h index f54ec4e..1f8c2c6 100644 --- a/src/kvpnc.h +++ b/src/kvpnc.h @@ -381,8 +381,8 @@ private slots: void readFromStderr_ipsec(); void readFromStdout_ipsecwhack(); void readFromStderr_ipsecwhack(); - void readFromStdout_ipsecwhactdelisten(); - void readFromStderr_ipsecwhactdelisten(); + void readFromStdout_ipsecwhacklisten(); + void readFromStderr_ipsecwhacklisten(); void readFromStdout_ipsecwhackstatus(); void readFromStderr_ipsecwhackstatus(); void readFromStdout_ipsecwhackdelete(); |