gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-02-24 11:15:49 +01:00
Code Issues Projects Releases Wiki Activity

experimental:

Browse Source 
- Fix potential deadlock in connection thread
- Make wireless interface blank string if set to None in config.
This commit is contained in:
imdano
2008-09-19 16:28:26 +00:00
parent 890b5ee16a
commit ccbd6ad392
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wicd/networking.py
View File

@@ -227,9 +227,12 @@ class ConnectThread(threading.Thread):
def set_should_die(self, val): def set_should_die(self, val):
self.lock.acquire() self.lock.acquire()
self._should_die = val try:
self._should_die = val
finally:
self.lock.release()
should_die = property(should_die, get_should_die, set_should_die) should_die = property(get_should_die, set_should_die)
def SetStatus(self, status): def SetStatus(self, status):
@@ -352,7 +355,7 @@ class ConnectThread(threading.Thread):
""" """
if self.abort_reason: if self.abort_reason:
reason = self.abort_reason reason = self.abort_reason
self.SetStatus(reason) self.connecting_message = reason
self.is_aborted = True self.is_aborted = True
self.abort_msg = reason self.abort_msg = reason
self.is_connecting = False self.is_connecting = False
@@ -381,7 +384,6 @@ class ConnectThread(threading.Thread):
try: try:
if self._should_die: if self._should_die:
self.connect_aborted('aborted') self.connect_aborted('aborted')
self.lock.release()
thread.exit() thread.exit()
finally: finally:
self.lock.release() self.lock.release()

4
wicd/wicd-daemon.py
View File

@@ -140,8 +140,8 @@ class WicdDaemon(dbus.service.Object):
def SetWirelessInterface(self, interface): def SetWirelessInterface(self, interface):
""" Sets the wireless interface the daemon will use. """ """ Sets the wireless interface the daemon will use. """
print "setting wireless interface %s" % (str(interface)) print "setting wireless interface %s" % (str(interface))
self.wifi.wireless_interface = interface self.wifi.wireless_interface = noneToBlankString(interface)
self.wired.wireless_interface = interface self.wired.wireless_interface = noneToBlankString(interface)
self.config.set("Settings", "wireless_interface", interface, True) self.config.set("Settings", "wireless_interface", interface, True)
@dbus.service.method('org.wicd.daemon') @dbus.service.method('org.wicd.daemon')