You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
1.9 KiB
40 lines
1.9 KiB
--- ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp.orig 2012-05-02 04:58:04.051212974 -0400
|
|
+++ ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp 2012-05-02 05:07:11.093803088 -0400
|
|
@@ -305,14 +305,15 @@
|
|
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.").tqarg( protUsage->protocol()->name() ).tqarg( m_zone->guiName() )
|
|
);
|
|
- KMFProtocolUsage * pro = 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 @@
|
|
} 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.").tqarg( protUsage->protocol()->name() ).tqarg( m_host->guiName() )
|
|
);
|
|
- KMFProtocolUsage * pro = 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;
|