diff options
| author | Darrell Anderson <[email protected]> | 2012-05-06 13:48:14 -0500 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-06-24 05:10:00 +0200 |
| commit | 0b0877aa32667311bfa6b785c9486b2e5a233295 (patch) | |
| tree | 004f18af403ec37d5233643fd1684a1668108f0b | |
| parent | 67a78e98cca704e513fa66398ac144e1bb88305f (diff) | |
| download | kmyfirewall-0b0877aa32667311bfa6b785c9486b2e5a233295.tar.gz kmyfirewall-0b0877aa32667311bfa6b785c9486b2e5a233295.zip | |
Updated patch from GIT hash 88d2d2a7.
Thanks to Francois Andriot.
(cherry picked from commit 5a6eca6ce18eeebcb16c9489a05a3c89da01a3af)
| -rw-r--r-- | kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp index 6916cfd..3f6a328 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp @@ -305,14 +305,15 @@ void KMFGenericInterfaceProtocol::slotProtocolClicked( KMFProtocolUsage* protUsa if ( m_zone && ! m_host ) { if ( onOff ) { m_protocolUsage = 0; - if ( KMFProtocolUsage* pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) { + KMFProtocolUsage* pro; + if ( pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) { m_protocolUsage = pro; } else { KMFUndoEngine::instance()->startTransaction( m_zone, i18n("Add protocol %1 to zone %2.").arg( protUsage->protocol()->name() ).arg( m_zone->guiName() ) ); - KMFProtocolUsage * prot = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() ); + pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() ); if ( pro ) { kdDebug() << "Added Protocol to zone: " << m_zone-> name() << endl; @@ -341,15 +342,16 @@ void KMFGenericInterfaceProtocol::slotProtocolClicked( KMFProtocolUsage* protUsa } else if ( m_host ) { if ( onOff ) { m_protocolUsage = 0; + KMFProtocolUsage* pro; - if ( KMFProtocolUsage* pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) { + if ( pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) { m_protocolUsage = pro; } else { KMFUndoEngine::instance()->startTransaction( m_host, i18n("Add protocol %1 to host %2.").arg( protUsage->protocol()->name() ).arg( m_host->guiName() ) ); - KMFProtocolUsage * prot = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() ); + pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() ); if ( pro ) { kdDebug() << "Added Protocol to host: " << m_host-> name() << endl; |