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

Fix crashing bug in daemon.

Browse Source 
Dont have wicd-monitor inherit stdin from the daemon.
This commit is contained in:
Dan O'Reilly
2009-02-08 18:42:05 -05:00
parent 725da7c5b3
commit e162bb1c7b
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wicd/wicd-daemon.py
View File

@@ -97,7 +97,6 @@ class WicdDaemon(dbus.service.Object):
self.connection_info = [""] self.connection_info = [""]
self.auto_connecting = False self.auto_connecting = False
self.prefer_wired = False self.prefer_wired = False
self._scanning = False
self.dhcp_client = 0 self.dhcp_client = 0
self.link_detect_tool = 0 self.link_detect_tool = 0
self.flush_tool = 0 self.flush_tool = 0
@@ -922,6 +921,7 @@ class WirelessDaemon(dbus.service.Object):
self.wifi = wifi self.wifi = wifi
self._debug_mode = debug self._debug_mode = debug
self.forced_disconnect = False self.forced_disconnect = False
self._scanning = False
self.LastScan = [] self.LastScan = []
self.config = ConfigManager(os.path.join(wpath.etc, self.config = ConfigManager(os.path.join(wpath.etc,
"wireless-settings.conf"), "wireless-settings.conf"),
@@ -1272,9 +1272,7 @@ class WirelessDaemon(dbus.service.Object):
print 'Autoconnect failed because wireless interface returned None' print 'Autoconnect failed because wireless interface returned None'
return return
if fresh: if fresh:
print 'start scan'
self.Scan(sync=True) self.Scan(sync=True)
print 'end scan'
for x, network in enumerate(self.LastScan): for x, network in enumerate(self.LastScan):
if bool(network["has_profile"]): if bool(network["has_profile"]):
@@ -1680,10 +1678,8 @@ def main(argv):
wicd_bus = dbus.service.BusName('org.wicd.daemon', bus=bus) wicd_bus = dbus.service.BusName('org.wicd.daemon', bus=bus)
daemon = WicdDaemon(wicd_bus, auto_connect=auto_connect) daemon = WicdDaemon(wicd_bus, auto_connect=auto_connect)
if not no_poll: if not no_poll:
(child_pid, x, x, x) = gobject.spawn_async( (child_pid, x, y, z) = gobject.spawn_async(
[misc.find_path("python"), "-O", os.path.join(wpath.lib, "monitor.py")], [misc.find_path("python"), "-O", os.path.join(wpath.lib, "monitor.py")])
flags=gobject.SPAWN_CHILD_INHERITS_STDIN
)
signal.signal(signal.SIGTERM, sigterm_caught) signal.signal(signal.SIGTERM, sigterm_caught)
# Enter the main loop # Enter the main loop