diff --git a/daemon.py b/daemon.py index 73e6df3..934202d 100644 --- a/daemon.py +++ b/daemon.py @@ -938,7 +938,6 @@ class ConnectionWizard(dbus.service.Object): @dbus.service.method('org.wicd.daemon.config') def CreateWiredNetworkProfile(self, profilename): """ Creates a wired network profile. """ - #should include: profilename, ip, netmask, gateway, dns1, dns2, dns3 profilename = misc.to_unicode(profilename) print "creating profile for " + profilename config = ConfigParser.ConfigParser() @@ -971,7 +970,7 @@ class ConnectionWizard(dbus.service.Object): for profile in profileList: print "profile = ", profile if config.has_option(profile, "lastused"): - if config.get(profile, "lastused") == "True": + if misc.to_bool(config.get(profile, "lastused")): print "removing existing lastused" config.set(profile, "lastused", False) self.SaveWiredNetworkProfile(profile) @@ -1008,7 +1007,7 @@ class ConnectionWizard(dbus.service.Object): profileList = config.sections() for profile in profileList: if config.has_option(profile,"lastused"): - if config.get(profile,"lastused") == "True": + if misc.to_bool(config.get(profile,"lastused")): return profile return None @@ -1110,8 +1109,8 @@ class ConnectionWizard(dbus.service.Object): return cur_network = self.LastScan[id] essid_key = "essid:" + cur_network["essid"] - print ''.join("setting network option ", str(option), " to ", - str(cur_network[option])) + print ''.join(["setting network option ", str(option), " to ", + str(cur_network[option])]) config = ConfigParser.ConfigParser() config.read(self.wireless_conf) @@ -1235,7 +1234,7 @@ class ConnectionWizard(dbus.service.Object): if config.has_option(section, option): ret = config.get(section, option) - print 'found ' + option + ' in configuration', ret + print ''.join(['found ', option, ' in configuration ', ret]) else: config.set(section, option, default) ret = default diff --git a/gui.py b/gui.py index 8a9e5a8..5b6d459 100644 --- a/gui.py +++ b/gui.py @@ -580,6 +580,8 @@ class WirelessSettingsDialog(AdvancedSettingsDialog): if wireless.GetWirelessProperty(networkID, 'use_settings_globally'): self.chkbox_global_settings.set_active(True) + else: + self.chkbox_global_settings.set_active(False) def format_entry(self, networkid, label): """ Helper method for fetching/formatting wireless properties. """ @@ -1614,8 +1616,8 @@ class appGui: # First make sure all the Addresses entered are valid. if entry.chkbox_static_ip.get_active(): - for ent in [entry.txt_ip, entry.txt_netmask, entry.txt_gateway]: - entlist.append(ent) + enlist = [ent for ent in [entry.txt_ip, entry.txt_netmask, + entry.txt_gateway]] if entry.chkbox_static_dns.get_active() and \ not entry.chkbox_global_dns.get_active():