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

Fix bug where link detection tool value wasn't get propogated down the stack.

Browse Source
This commit is contained in:
Dan O'Reilly
2009-02-03 23:48:58 -05:00
parent 227704f137
commit 3fe1bca50e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wicd/backends/be-external.py
View File

@@ -199,8 +199,8 @@ class WiredInterface(Interface, wnettools.BaseWiredInterface):
elif self.miitool_cmd and self.link_detect in [misc.MIITOOL, misc.AUTO]: elif self.miitool_cmd and self.link_detect in [misc.MIITOOL, misc.AUTO]:
return self._mii_get_plugged_in() return self._mii_get_plugged_in()
else: else:
print 'Error: No way of checking for a wired connection. Make ' + \ print ('Error: No way of checking for a wired connection. Make ' +
'sure that either mii-tool or ethtool is installed.' 'sure that either mii-tool or ethtool is installed.')
return False return False
def _eth_get_plugged_in(self): def _eth_get_plugged_in(self):

4
wicd/backends/be-ioctl.py
View File

@@ -196,8 +196,8 @@ class WiredInterface(Interface, wnettools.BaseWiredInterface):
elif self.miitool_cmd and self.link_detect in [misc.MIITOOL, misc.AUTO]: elif self.miitool_cmd and self.link_detect in [misc.MIITOOL, misc.AUTO]:
return self._mii_get_plugged_in() return self._mii_get_plugged_in()
else: else:
print 'Error: No way of checking for a wired connection. Make \ print ('Error: No way of checking for a wired connection. Make' +
sure that either mii-tool or ethtool is installed.' 'sure that either mii-tool or ethtool is installed.')
return False return False
def _eth_get_plugged_in(self): def _eth_get_plugged_in(self):

2
wicd/wicd-daemon.py
View File

@@ -616,7 +616,7 @@ class WicdDaemon(dbus.service.Object):
""" """
self.link_detect_tool = int(link_tool) self.link_detect_tool = int(link_tool)
self.wired.link_tool = int(link_tool) self.wired.link_detect = int(link_tool)
self.config.set("Settings", "link_detect_tool", link_tool, write=True) self.config.set("Settings", "link_detect_tool", link_tool, write=True)
@dbus.service.method('org.wicd.daemon') @dbus.service.method('org.wicd.daemon')