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

Convert strings being prints out by dhclients to utf-8 before trying to log them.

When iwscan displays two entries for a hidden network, only display the one with the essid included.
This commit is contained in:
Dan O'Reilly
2009-06-14 14:25:06 -04:00
parent d2d2bae6d8
commit d07dea2390
2 changed files with 20 additions and 7 deletions

View File

@@ -315,6 +315,13 @@ class ConnectThread(threading.Thread):
self.SetStatus('interface_down')
def run(self):
self.connect_result = "Failed"
try:
self._connect()
finally:
self.is_connecting = False
def set_should_die(self, val):
self.lock.acquire()
try:
@@ -794,7 +801,7 @@ class WirelessConnectThread(ConnectThread):
self.wpa_driver = wpa_driver
def run(self):
def _connect(self):
""" The main function of the connection thread.
This function performs the necessary calls to connect to the
@@ -1006,7 +1013,7 @@ class WiredConnectThread(ConnectThread):
after_script, disconnect_script, gdns1, gdns2,
gdns3, gdns_dom, gsearch_dom, liface, debug)
def run(self):
def _connect(self):
""" The main function of the connection thread.
This function performs the necessary calls to connect to the