1
0
mirror of https://github.com/gryf/wicd.git synced 2026-03-05 08:15:46 +01:00

Make sure that SetConnectionStatus is called with an array of only strings,

thanks to Michael Terry.
This commit is contained in:
David Paleino
2012-10-12 09:14:25 +02:00

View File

@@ -274,13 +274,15 @@ class ConnectionStatus(object):
if wired.CheckIfWiredConnecting(): if wired.CheckIfWiredConnecting():
info = ["wired"] info = ["wired"]
else: else:
info = ["wireless", wireless.GetCurrentNetwork(iwconfig)] info = ["wireless",
misc.noneToBlankString(wireless.GetCurrentNetwork(iwconfig))]
elif state == misc.WIRELESS: elif state == misc.WIRELESS:
self.reconnect_tries = 0 self.reconnect_tries = 0
info = [str(wifi_ip), wireless.GetCurrentNetwork(iwconfig), info = [str(wifi_ip),
misc.noneToBlankString(wireless.GetCurrentNetwork(iwconfig)),
str(self._get_printable_sig_strength()), str(self._get_printable_sig_strength()),
str(wireless.GetCurrentNetworkID(iwconfig)), str(wireless.GetCurrentNetworkID(iwconfig)),
wireless.GetCurrentBitrate(iwconfig)] misc.noneToBlankString(wireless.GetCurrentBitrate(iwconfig))]
elif state == misc.WIRED: elif state == misc.WIRED:
self.reconnect_tries = 0 self.reconnect_tries = 0
info = [str(wired_ip)] info = [str(wired_ip)]