Attachment #151587 for bug #211288

Lines 57-64 Link Here

(-)kmyfirewall/kmfwidgets/kmfsystemsettingslinux.cpp.orig (-2 / +13 lines)
57	this, SLOT( slotSettingChanged() ) );	57	this, SLOT( slotSettingChanged() ) );
58	connect( m_cob_distribution, SIGNAL( activated( const QString& ) ),	58	connect( m_cob_distribution, SIGNAL( activated( const QString& ) ),
59	this, SLOT( slotDistributionChanged() ) );	59	this, SLOT( slotDistributionChanged() ) );
60	}	60
61		61	m_url_ipt_path->setEnabled( false );
		62	m_url_mod_path->setEnabled( false );
		63	m_url_init_path->setEnabled( false );
		64	m_url_runlevel_path->setEnabled( false );
		65	m_cob_distribution->setEnabled( false );
		66	}
		67
62	KMFSystemSettingsLinux::~KMFSystemSettingsLinux()	68	KMFSystemSettingsLinux::~KMFSystemSettingsLinux()
63	{	69	{
64	}	70	}
Lines 77-82 Link Here
77	kdDebug() << "KMFInterfaceWidget::updateView() - ERROR: m_target == 0 " << endl;	83	kdDebug() << "KMFInterfaceWidget::updateView() - ERROR: m_target == 0 " << endl;
78	return;	84	return;
79	}	85	}
		86	m_url_ipt_path->setEnabled( true );
		87	m_url_mod_path->setEnabled( true );
		88	m_url_init_path->setEnabled( true );
		89	m_url_runlevel_path->setEnabled( true );
		90	m_cob_distribution->setEnabled( true );
80	KMFTargetConfig *conf = m_target->config();	91	KMFTargetConfig *conf = m_target->config();
81		92
82	kdDebug() << "KMFInterfaceWidget::updateView() - config: " << endl;	93	kdDebug() << "KMFInterfaceWidget::updateView() - config: " << endl;

Lines 53-58 Link Here

(-)kmyfirewall/kmfwidgets/kmfinterfacewidget.cpp.orig (+8 lines)
53	m_cb_int_name->insertItem( "tap" );	53	m_cb_int_name->insertItem( "tap" );
54	m_cb_int_name->insertItem( "gre" );	54	m_cb_int_name->insertItem( "gre" );
55	m_cb_int_name->insertItem( "lo" );	55	m_cb_int_name->insertItem( "lo" );
		56	m_cb_int_name->setEnabled( false );
		57	m_sb_int_num->setEnabled( false );
		58	m_b_add_int->setEnabled( false );
		59	m_b_del_int->setEnabled( false );
56	}	60	}
57		61
58	KMFInterfaceWidget::~KMFInterfaceWidget() {}	62	KMFInterfaceWidget::~KMFInterfaceWidget() {}
Lines 68-73 Link Here
68	if ( ! m_target ) {	72	if ( ! m_target ) {
69	return;	73	return;
70	}	74	}
		75	m_cb_int_name->setEnabled( true );
		76	m_sb_int_num->setEnabled( true );
		77	m_b_add_int->setEnabled( true );
		78	m_b_del_int->setEnabled( true );
71	KMFTargetConfig *conf = m_target->config();	79	KMFTargetConfig *conf = m_target->config();
72	kdDebug() << "Load Config:" << endl;	80	kdDebug() << "Load Config:" << endl;
73	kdDebug() << conf->toString() << endl;	81	kdDebug() << conf->toString() << endl;

Lines 1-9 Link Here

(-)templates/04_web_server_template.tkmfrs.orig (-2 / +2 lines)
1	<!DOCTYPE kmyfirewall-ruleset>	1	<!DOCTYPE kmyfirewall-ruleset>
2	<kmfnet maxVersion="~" minVersion="1.1.0" version="1.1.0" interface="iptables" uuid="{41b36b2b-68e2-4545-b34d-3cf3609c204f}" >	2	<kmfnet maxVersion="~" minVersion="1.1.0" version="1.1.0" interface="iptables" uuid="{41b36b2b-68e2-4545-b34d-3cf3609c204f}" >
3	<netzone guiName="Gloabl Network" readonly="bool:on" uuid="{3349418e-3923-4f3c-933c-b1bd91a2c84a}" name="mynetwork" description="This is the global zone that contains all valid IP addresses." >	3	<netzone guiName="Global Network" readonly="bool:on" uuid="{3349418e-3923-4f3c-933c-b1bd91a2c84a}" name="mynetwork" description="This is the global zone that contains all valid IP addresses." >
4	<fromIP address="0.0.0.0" />	4	<fromIP address="0.0.0.0" />
5	<netMask address="0" />	5	<netMask address="0" />
6	<target sshPort="22" address="127.0.0.1" guiName="My Local Computer" readonly="bool:on" uuid="{42bc1c1f-996f-4f60-a6e3-3e43cd6f0167}" name="localhost" description="Local copmuter running KMyFirewall" >	6	<target sshPort="22" address="127.0.0.1" guiName="My Local Computer" readonly="bool:on" uuid="{42bc1c1f-996f-4f60-a6e3-3e43cd6f0167}" name="localhost" description="Local computer running KMyFirewall" >
7	<targetconfig uuid="{c3d33a7a-5ba9-45cc-8f34-1617b773e08f}" name="Untitled" description="No Description Available" >	7	<targetconfig uuid="{c3d33a7a-5ba9-45cc-8f34-1617b773e08f}" name="Untitled" description="No Description Available" >
8	<os name="linux" />	8	<os name="linux" />
9	<backend name="iptables" />	9	<backend name="iptables" />

Lines 1-9 Link Here

(-)templates/03_nat_router_template.tkmfrs.orig (-2 / +2 lines)
1	<!DOCTYPE kmyfirewall-ruleset>	1	<!DOCTYPE kmyfirewall-ruleset>
2	<kmfnet maxVersion="~" minVersion="1.1.0" version="1.1.0" interface="iptables" uuid="{41b36b2b-68e2-4545-b34d-3cf3609c204f}" >	2	<kmfnet maxVersion="~" minVersion="1.1.0" version="1.1.0" interface="iptables" uuid="{41b36b2b-68e2-4545-b34d-3cf3609c204f}" >
3	<netzone guiName="Gloabl Network" readonly="bool:on" uuid="{3349418e-3923-4f3c-933c-b1bd91a2c84a}" name="mynetwork" description="This is the global zone that contains all valid IP addresses." >	3	<netzone guiName="Global Network" readonly="bool:on" uuid="{3349418e-3923-4f3c-933c-b1bd91a2c84a}" name="mynetwork" description="This is the global zone that contains all valid IP addresses." >
4	<fromIP address="0.0.0.0" />	4	<fromIP address="0.0.0.0" />
5	<netMask address="0" />	5	<netMask address="0" />
6	<target sshPort="22" address="127.0.0.1" guiName="My Local Computer" readonly="bool:on" uuid="{f71cacc9-e95c-4867-aab2-7cafd847dab8}" name="localhost" description="Local copmuter running KMyFirewall" >	6	<target sshPort="22" address="127.0.0.1" guiName="My Local Computer" readonly="bool:on" uuid="{f71cacc9-e95c-4867-aab2-7cafd847dab8}" name="localhost" description="Local computer running KMyFirewall" >
7	<targetconfig uuid="{634f667c-965e-42e8-ade6-5906f4037873}" name="Untitled" description="No Description Available" >	7	<targetconfig uuid="{634f667c-965e-42e8-ade6-5906f4037873}" name="Untitled" description="No Description Available" >
8	<os name="linux" />	8	<os name="linux" />
9	<backend name="iptables" />	9	<backend name="iptables" />

Lines 1-9 Link Here

(-)templates/02_workstation_template.tkmfrs.orig (-2 / +2 lines)
1	<!DOCTYPE kmyfirewall-ruleset>	1	<!DOCTYPE kmyfirewall-ruleset>
2	<kmfnet maxVersion="~" minVersion="1.1.0" version="1.1.0" interface="iptables" uuid="{41b36b2b-68e2-4545-b34d-3cf3609c204f}" >	2	<kmfnet maxVersion="~" minVersion="1.1.0" version="1.1.0" interface="iptables" uuid="{41b36b2b-68e2-4545-b34d-3cf3609c204f}" >
3	<netzone guiName="Gloabl Network" readonly="bool:on" uuid="{3349418e-3923-4f3c-933c-b1bd91a2c84a}" name="mynetwork" description="This is the global zone that contains all valid IP addresses." >	3	<netzone guiName="Global Network" readonly="bool:on" uuid="{3349418e-3923-4f3c-933c-b1bd91a2c84a}" name="mynetwork" description="This is the global zone that contains all valid IP addresses." >
4	<fromIP address="0.0.0.0" />	4	<fromIP address="0.0.0.0" />
5	<netMask address="0" />	5	<netMask address="0" />
6	<target sshPort="22" address="127.0.0.1" guiName="My Local Computer" readonly="bool:on" uuid="{42bc1c1f-996f-4f60-a6e3-3e43cd6f0167}" name="localhost" description="Local copmuter running KMyFirewall" >	6	<target sshPort="22" address="127.0.0.1" guiName="My Local Computer" readonly="bool:on" uuid="{42bc1c1f-996f-4f60-a6e3-3e43cd6f0167}" name="localhost" description="Local computer running KMyFirewall" >
7	<targetconfig uuid="{c3d33a7a-5ba9-45cc-8f34-1617b773e08f}" name="Untitled" description="No Description Available" >	7	<targetconfig uuid="{c3d33a7a-5ba9-45cc-8f34-1617b773e08f}" name="Untitled" description="No Description Available" >
8	<os name="linux" />	8	<os name="linux" />
9	<backend name="iptables" />	9	<backend name="iptables" />

Return to bug 211288

Lines 108-114 Link Here

(-)kmyfirewall/core/kmfnetwork.cpp.orig (-2 / +2 lines)
108	kdDebug() << "Creating Localhost" << endl;	108	kdDebug() << "Creating Localhost" << endl;
109	KMFTarget * localhost = new KMFTarget( m_myNetwork, "My Local Comuter", i18n("My Local Comuter"), this );	109	KMFTarget * localhost = new KMFTarget( m_myNetwork, "My Local Comuter", i18n("My Local Comuter"), this );
110	localhost->setGuiName( i18n("My Local Computer") );	110	localhost->setGuiName( i18n("My Local Computer") );
111	localhost->setDescription( i18n("Local copmuter running KMyFirewall") );	111	localhost->setDescription( i18n("Local computer running KMyFirewall") );
112	localhost->setAddress( Constants::Localhost_IP );	112	localhost->setAddress( Constants::Localhost_IP );
113	localhost->setName( Constants::Localhost_Name );	113	localhost->setName( Constants::Localhost_Name );
114	localhost->setReadOnly( true );	114	localhost->setReadOnly( true );
Lines 126-132 Link Here
126	m_err = new KMFError;	126	m_err = new KMFError;
127	// setName( i18n("Unamed Ruleset") );	127	// setName( i18n("Unamed Ruleset") );
128	m_url.setFileName( i18n( "Untitled" ) );	128	m_url.setFileName( i18n( "Untitled" ) );
129	m_myNetwork->setGuiName( i18n("Gloabl Network") );	129	m_myNetwork->setGuiName( i18n("Global Network") );
130	m_myNetwork->setDescription( i18n("This is the global zone that contains all valid IP addresses.") );	130	m_myNetwork->setDescription( i18n("This is the global zone that contains all valid IP addresses.") );
131	m_myNetwork->setZone( IPAddress( 0,0,0,0 ), 0 );	131	m_myNetwork->setZone( IPAddress( 0,0,0,0 ), 0 );
132	m_myNetwork->setReadOnly( true );	132	m_myNetwork->setReadOnly( true );