gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-02-23 02:25:48 +01:00
Code Issues Projects Releases Wiki Activity

Fix some minor formatting issues

Browse Source 
Don't save wired profiles that have only whitespace in their names.
This commit is contained in:
Dan O'Reilly
2009-08-01 18:57:00 -04:00
parent 6e132f1028
commit d684bac0ab
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wicd/wicd-daemon.py
View File

@@ -84,7 +84,7 @@ class WicdDaemon(dbus.service.Object):
self._debug_mode = bool(self.config.get("Settings", "debug_mode")) self._debug_mode = bool(self.config.get("Settings", "debug_mode"))
self.wifi = networking.Wireless(debug=self._debug_mode) self.wifi = networking.Wireless(debug=self._debug_mode)
self.wired = networking.Wired(debug=self._debug_mode) self.wired = networking.Wired(debug=self._debug_mode)
self.wired_bus= WiredDaemon(bus_name, self, wired=self.wired) self.wired_bus = WiredDaemon(bus_name, self, wired=self.wired)
self.wireless_bus = WirelessDaemon(bus_name, self, wifi=self.wifi) self.wireless_bus = WirelessDaemon(bus_name, self, wifi=self.wifi)
self.forced_disconnect = False self.forced_disconnect = False
self.need_profile_chooser = False self.need_profile_chooser = False
@@ -518,7 +518,7 @@ class WicdDaemon(dbus.service.Object):
# 1 = default profile # 1 = default profile
# 2 = show list # 2 = show list
# 3 = last used profile # 3 = last used profile
self.config.set("Settings","wired_connect_mode", int(method), self.config.set("Settings", "wired_connect_mode", int(method),
write=True) write=True)
self.wired_connect_mode = int(method) self.wired_connect_mode = int(method)
self.wired_bus.connect_mode = int(method) self.wired_bus.connect_mode = int(method)
@@ -856,7 +856,7 @@ class WicdDaemon(dbus.service.Object):
""" """
b_wired = self.wired_bus b_wired = self.wired_bus
b_wifi = self.wireless_bus b_wifi = self.wireless_bus
app_conf= self.config app_conf = self.config
# Load the backend. # Load the backend.
be_def = 'external' be_def = 'external'
self.SetBackend(app_conf.get("Settings", "backend", default=be_def)) self.SetBackend(app_conf.get("Settings", "backend", default=be_def))
@@ -880,7 +880,7 @@ class WicdDaemon(dbus.service.Object):
dns1 = app_conf.get("Settings", "global_dns_1", default='None') dns1 = app_conf.get("Settings", "global_dns_1", default='None')
dns2 = app_conf.get("Settings", "global_dns_2", default='None') dns2 = app_conf.get("Settings", "global_dns_2", default='None')
dns3 = app_conf.get("Settings", "global_dns_3", default='None') dns3 = app_conf.get("Settings", "global_dns_3", default='None')
dns_dom =app_conf.get("Settings", "global_dns_dom", default='None') dns_dom = app_conf.get("Settings", "global_dns_dom", default='None')
search_dom = app_conf.get("Settings", "global_search_dom", default='None') search_dom = app_conf.get("Settings", "global_search_dom", default='None')
self.SetGlobalDNS(dns1, dns2, dns3, dns_dom, search_dom) self.SetGlobalDNS(dns1, dns2, dns3, dns_dom, search_dom)
self.SetAutoReconnect(app_conf.get("Settings", "auto_reconnect", self.SetAutoReconnect(app_conf.get("Settings", "auto_reconnect",
@@ -1448,7 +1448,7 @@ class WiredDaemon(dbus.service.Object):
if self.config.has_section(profilename): if self.config.has_section(profilename):
return False return False
for option in ["ip", "broadcast", "netmask","gateway", "search_domain", for option in ["ip", "broadcast", "netmask", "gateway", "search_domain",
"dns_domain", "dns1", "dns2", "dns3", "beforescript", "dns_domain", "dns1", "dns2", "dns3", "beforescript",
"afterscript", "predisconnectscript", "afterscript", "predisconnectscript",
"postdisconnectscript"]: "postdisconnectscript"]:
@@ -1506,8 +1506,10 @@ class WiredDaemon(dbus.service.Object):
if not self.config.has_option(prof, script): if not self.config.has_option(prof, script):
self.config.set(prof, script, None) self.config.set(prof, script, None)
if profilename == "": profilename = profilename.strip()
if not profilename:
self.config.write() self.config.write()
print "Warning: Bad wired profile name given, ignoring."
return "500: Bad Profile name" return "500: Bad Profile name"
if self.debug_mode: if self.debug_mode:
print "saving wired profile %s" % profilename print "saving wired profile %s" % profilename