gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-23 14:42:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix saving scripts not working correctly.

Browse Source
This commit is contained in:
Dan O'Reilly
2008-12-13 13:28:05 -05:00
parent 69b011a1e7
commit 6e4d70c4ea
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wicd/wicd-daemon.py
View File

@@ -1066,7 +1066,8 @@ class WirelessDaemon(dbus.service.Object):
def SaveWirelessNetworkProfile(self, id):
""" Writes a wireless profile to disk. """
def write_script_ent(prof, script):
self.config.set(prof, script, None)
if not self.config.has_option(prof, script):
self.config.set(prof, script, None)
cur_network = self.LastScan[id]
bssid_key = cur_network["bssid"]
@@ -1088,12 +1089,12 @@ class WirelessDaemon(dbus.service.Object):
write_script_ent(bssid_key, "beforescript")
write_script_ent(bssid_key, "afterscript")
write_script_ent(bssid_key, "disconnect")
write_script_ent(bssid_key, "disconnectscript")
if cur_network["use_settings_globally"]:
write_script_ent(essid_key, "beforescript")
write_script_ent(essid_key, "afterscript")
write_script_ent(essid_key, "disconnect")
write_script_ent(essid_key, "disconnectscript")
self.config.write()
@@ -1120,7 +1121,12 @@ class WirelessDaemon(dbus.service.Object):
""" Removes the global entry for the networkid provided. """
essid_key = "essid:" + str(self.LastScan[networkid])
self.config.remove_section(essid_key)
@dbus.service.method('org.wicd.daemon.wireless')
def ReloadConfig(self):
""" Reloads the active config file. """
self.config.reload()
@dbus.service.signal(dbus_interface='org.wicd.daemon.wireless', signature='')
def SendStartScanSignal(self):
""" Emits a signal announcing a scan has started. """
@@ -1395,6 +1401,11 @@ class WiredDaemon(dbus.service.Object):
if not sections:
sections = [""]
return sections
@dbus.service.method('org.wicd.daemon.wired')
def ReloadConfig(self):
""" Reloads the active config file. """
self.config.reload()
def usage():