Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-09-27 18:44:22 (GMT)
committer Simon McVittie <simon.mcvittie@collabora.co.uk>2007-10-01 15:01:54 (GMT)
commitff509f5030e926e66c4b2059c7d1e20beb953e38 (patch)
tree51ee9251d8dc570b8845e65ca2c4af84d562c446
parented40d657916e837067072c20364abe44ab371ed1 (diff)
Use 3 second timeout for blocking calls to NetworkManager, not 3000 seconds! (#3905)
-rw-r--r--shell/hardware/nmclient.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/hardware/nmclient.py b/shell/hardware/nmclient.py
index 042ee6f..d23a206 100644
--- a/shell/hardware/nmclient.py
+++ b/shell/hardware/nmclient.py
@@ -338,7 +338,7 @@ class Device(gobject.GObject):
if self._type != DEVICE_TYPE_802_11_MESH_OLPC:
raise RuntimeError("Only valid for mesh devices")
try:
- step = self.dev.getMeshStep(timeout=3000)
+ step = self.dev.getMeshStep(timeout=3)
except dbus.DBusException, e:
step = 0
return step
@@ -346,7 +346,7 @@ class Device(gobject.GObject):
def get_frequency(self):
freq = 0.0
try:
- freq = self.dev.getFrequency(timeout=3000)
+ freq = self.dev.getFrequency(timeout=3)
except dbus.DBusException, e:
pass
# Hz -> GHz