From 280ffa3e9ac601210d65d260c2fdee52a5b7c63b Mon Sep 17 00:00:00 2001
From: hschang <chang@dev3>
Date: Thu, 20 Jun 2013 13:07:44 +0900
Subject: [PATCH] NetworkWizard : remove confdns for inet static.

---
 .../Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py     |  8 ++------
 .../Plugins/SystemPlugins/NetworkWizard/networkwizard.xml    | 12 ------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py b/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
index cb954bb..ee6f5b0 100755
--- a/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
+++ b/lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
@@ -200,12 +200,8 @@ class NetworkWizard(WizardLanguage, Rc):
 
 	def AdapterSetupEnd(self, iface):
 		self.originalInterfaceStateChanged = True
-		if iNetwork.getAdapterAttribute(iface, "dhcp") is True:
-			iNetwork.checkNetworkState(self.AdapterSetupEndFinished)
-			self.AdapterRef = self.session.openWithCallback(self.AdapterSetupEndCB, MessageBox, _("Please wait while we test your network..."), type = MessageBox.TYPE_INFO, enable_input = False)
-		else:
-			self.currStep = self.getStepWithID("confdns")
-			self.afterAsyncCode()
+		iNetwork.checkNetworkState(self.AdapterSetupEndFinished)
+		self.AdapterRef = self.session.openWithCallback(self.AdapterSetupEndCB, MessageBox, _("Please wait while we test your network..."), type = MessageBox.TYPE_INFO, enable_input = False)
 
 	def AdapterSetupEndCB(self,data):
 		if data is True:
diff --git a/lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml b/lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml
index 0b3a298..3c7812c 100755
--- a/lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml
+++ b/lib/python/Plugins/SystemPlugins/NetworkWizard/networkwizard.xml
@@ -41,18 +41,6 @@ self.selectKey("RIGHT")
 self.AdapterSetupEnd(self.selectedInterface)
                 </code>                 
         </step>
-        <step id="confdns" nextstep="checklanstatusend">
-                <text value="Please configure or verify your Nameservers by filling out the required values.\nWhen you are ready press OK to continue." />
-                <displaytext value="Configure nameservers" />
-                <config screen="NameserverSetup" module="NetworkSetup" type="ConfigList" />
-                <code>
-self.clearSelectedKeys()
-self.selectKey("OK")
-                </code>
-                <code pos="after" async="yes">
-self.checkNetwork()
-                </code> 
-        </step>
         <step id="checklanstatusend" nextstep="end">
 		<condition>
 self.condition = (self.InterfaceState == True )
-- 
2.7.4