Merge lp:~mterry/wicd/no-none-in-update-state into lp:wicd/1.6

[Michael Terry]

GetCurrentNetwork and GetCurrentBitrate may return None, but when ConnectionStatus.update_state calls daemon.SetConnectionStatus, it can not afford to have Nones in the argument.

So it should guard against that by using misc.noneToBlankString.

[David Paleino (dpaleino)]

Thank you, merged in rev. 818!

=== modified file 'wicd/monitor.py'
--- wicd/monitor.py	2011-12-15 18:21:53 +0000
+++ wicd/monitor.py	2012-10-11 19:46:20 +0000
@@ -274,13 +274,15 @@
             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)]