From ff509f5030e926e66c4b2059c7d1e20beb953e38 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 27 Sep 2007 18:44:22 +0000 Subject: Use 3 second timeout for blocking calls to NetworkManager, not 3000 seconds! (#3905) --- 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 -- cgit v0.9.1