gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-21 13:28:08 +01:00
Code Issues Projects Releases Wiki Activity

Fixed bug caused by wired/wireless daemons using the same function names

Browse Source
This commit is contained in:
imdano
2007-07-10 14:32:45 +00:00
parent 4511aad391
commit 7aaf402389
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
daemon.py
View File

@@ -241,14 +241,14 @@ class ConnectionWizard(dbus.service.Object):
#end function DisconnectWireless #end function DisconnectWireless
@dbus.service.method('org.wicd.daemon.wireless') @dbus.service.method('org.wicd.daemon.wireless')
def SetBeforeScript(self,script): def SetWirelessBeforeScript(self,script):
self.wifi.before_script = script self.wifi.before_script = script
#end function SetBeforeScript #end function SetWirelessBeforeScript
@dbus.service.method('org.wicd.daemon.wireless') @dbus.service.method('org.wicd.daemon.wireless')
def SetAfterScript(self,script): def SetWirelessAfterScript(self,script):
self.wifi.after_script = script self.wifi.after_script = script
#end function SetAfterScript #end function SetWirelessAfterScript
@dbus.service.method('org.wicd.daemon.wireless') @dbus.service.method('org.wicd.daemon.wireless')
def GetNumberOfNetworks(self): def GetNumberOfNetworks(self):
@@ -487,16 +487,16 @@ class ConnectionWizard(dbus.service.Object):
#end function CheckIfWiredConnecting #end function CheckIfWiredConnecting
@dbus.service.method('org.wicd.daemon.wired') @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''' '''sets pre-connection script to run for a wired connection'''
self.wired.before_script = script self.wired.before_script = script
#end function SetBeforeScript #end function SetWiredBeforeScript
@dbus.service.method('org.wicd.daemon.wired') @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''' '''sets post-connection script to run for a wired connection'''
self.wired.after_script = script self.wired.after_script = script
#end function SetAfterScript #end function SetWiredAfterScript
@dbus.service.method('org.wicd.daemon.wired') @dbus.service.method('org.wicd.daemon.wired')
def CheckWiredConnectingMessage(self): def CheckWiredConnectingMessage(self):

8
gui.py
View File

@@ -1015,8 +1015,8 @@ class appGui:
after_script = networkentry.expander.txtAfterScript.get_text() after_script = networkentry.expander.txtAfterScript.get_text()
wireless.SetWirelessProperty(networkid,"beforescript",noneToString(before_script)) wireless.SetWirelessProperty(networkid,"beforescript",noneToString(before_script))
wireless.SetWirelessProperty(networkid,"afterscript",noneToString(after_script)) wireless.SetWirelessProperty(networkid,"afterscript",noneToString(after_script))
wireless.SetBeforeScript(before_script) wireless.SetWirelessBeforeScript(before_script)
wireless.SetAfterScript(after_script) wireless.SetWirelessAfterScript(after_script)
# if it exists. maybe kept as a value in the network entry? Not sure... # if it exists. maybe kept as a value in the network entry? Not sure...
print "connecting to wireless network..." print "connecting to wireless network..."
@@ -1048,8 +1048,8 @@ class appGui:
after_script = networkentry.expander.txtAfterScript.get_text() after_script = networkentry.expander.txtAfterScript.get_text()
wired.SetWiredProperty("beforescript",noneToString(before_script)) wired.SetWiredProperty("beforescript",noneToString(before_script))
wired.SetWiredProperty("afterscript",noneToString(after_script)) wired.SetWiredProperty("afterscript",noneToString(after_script))
wired.SetBeforeScript(before_script) wired.SetWiredBeforeScript(before_script)
wired.SetAfterScript(after_script) wired.SetWiredAfterScript(after_script)
config.SaveWiredNetworkProfile(networkentry.expander.comboProfileNames.get_active_text()) config.SaveWiredNetworkProfile(networkentry.expander.comboProfileNames.get_active_text())
wired.ConnectWired() wired.ConnectWired()

1
networking.py
View File

@@ -241,6 +241,7 @@ class Wireless:
if before_script != '' and before_script != None: if before_script != '' and before_script != None:
print 'Executing pre-connection script' print 'Executing pre-connection script'
misc.Run(before_script) misc.Run(before_script)
#put it down #put it down
print "interface down..." print "interface down..."
self.lock.acquire() self.lock.acquire()