From 7aaf402389d04834f3a64793dbb899e9785c2b20 Mon Sep 17 00:00:00 2001
From: imdano <>
Date: Tue, 10 Jul 2007 14:32:45 +0000
Subject: [PATCH] Fixed bug caused by wired/wireless daemons using the same
 function names

---
 daemon.py     | 16 ++++++++--------
 gui.py        |  8 ++++----
 networking.py |  1 +
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/daemon.py b/daemon.py
index 5c0325a..b5cf212 100644
--- a/daemon.py
+++ b/daemon.py
@@ -241,14 +241,14 @@ class ConnectionWizard(dbus.service.Object):
 	#end function DisconnectWireless
 
 	@dbus.service.method('org.wicd.daemon.wireless')
-	def SetBeforeScript(self,script):
+	def SetWirelessBeforeScript(self,script):
 		self.wifi.before_script = script
-	#end function SetBeforeScript
+	#end function SetWirelessBeforeScript
 
 	@dbus.service.method('org.wicd.daemon.wireless')
-	def SetAfterScript(self,script):
+	def SetWirelessAfterScript(self,script):
 		self.wifi.after_script = script
-	#end function SetAfterScript
+	#end function SetWirelessAfterScript
 
 	@dbus.service.method('org.wicd.daemon.wireless')
 	def GetNumberOfNetworks(self):
@@ -487,16 +487,16 @@ class ConnectionWizard(dbus.service.Object):
 	#end function CheckIfWiredConnecting
 
 	@dbus.service.method('org.wicd.daemon.wired')
-	def SetBeforeScript(self,script):
+	def SetWiredBeforeScript(self,script):
 		'''sets pre-connection script to run for a wired connection'''
 		self.wired.before_script = script
-	#end function SetBeforeScript
+	#end function SetWiredBeforeScript
 
 	@dbus.service.method('org.wicd.daemon.wired')
-	def SetAfterScript(self,script):
+	def SetWiredAfterScript(self,script):
 		'''sets post-connection script to run for a wired connection'''
 		self.wired.after_script = script
-	#end function SetAfterScript
+	#end function SetWiredAfterScript
 	
 	@dbus.service.method('org.wicd.daemon.wired')
 	def CheckWiredConnectingMessage(self):
diff --git a/gui.py b/gui.py
index 8dbe595..0edab89 100644
--- a/gui.py
+++ b/gui.py
@@ -1015,8 +1015,8 @@ class appGui:
 			after_script = networkentry.expander.txtAfterScript.get_text()
 			wireless.SetWirelessProperty(networkid,"beforescript",noneToString(before_script))
 			wireless.SetWirelessProperty(networkid,"afterscript",noneToString(after_script))
-			wireless.SetBeforeScript(before_script)
-			wireless.SetAfterScript(after_script)
+			wireless.SetWirelessBeforeScript(before_script)
+			wireless.SetWirelessAfterScript(after_script)
 
 			# if it exists.  maybe kept as a value in the network entry?  Not sure...
 			print "connecting to wireless network..."
@@ -1048,8 +1048,8 @@ class appGui:
 			after_script = networkentry.expander.txtAfterScript.get_text()
 			wired.SetWiredProperty("beforescript",noneToString(before_script))
 			wired.SetWiredProperty("afterscript",noneToString(after_script))
-			wired.SetBeforeScript(before_script)
-			wired.SetAfterScript(after_script)
+			wired.SetWiredBeforeScript(before_script)
+			wired.SetWiredAfterScript(after_script)
 		
 			config.SaveWiredNetworkProfile(networkentry.expander.comboProfileNames.get_active_text())
 			wired.ConnectWired()
diff --git a/networking.py b/networking.py
index aacd3ee..e369a24 100644
--- a/networking.py
+++ b/networking.py
@@ -241,6 +241,7 @@ class Wireless:
 			if before_script != '' and before_script != None:
 				print 'Executing pre-connection script'
 				misc.Run(before_script)
+
 			#put it down
 			print "interface down..."
 			self.lock.acquire()