From d18c82187f10309ea57de5570256c07edc0a14c0 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 11 Oct 2012 15:42:59 -0400 Subject: [PATCH] make sure that SetConnectionStatus is called with an array of only strings --- wicd/monitor.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/wicd/monitor.py b/wicd/monitor.py index a91d165..86790c6 100755 --- a/wicd/monitor.py +++ b/wicd/monitor.py @@ -274,13 +274,15 @@ class ConnectionStatus(object): if wired.CheckIfWiredConnecting(): info = ["wired"] else: - info = ["wireless", wireless.GetCurrentNetwork(iwconfig)] + info = ["wireless", + misc.noneToBlankString(wireless.GetCurrentNetwork(iwconfig))] elif state == misc.WIRELESS: 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(wireless.GetCurrentNetworkID(iwconfig)), - wireless.GetCurrentBitrate(iwconfig)] + misc.noneToBlankString(wireless.GetCurrentBitrate(iwconfig))] elif state == misc.WIRED: self.reconnect_tries = 0 info = [str(wired_ip)]