From 7794e9abb94c7e0b4c591c100e3a3ab1efd522b2 Mon Sep 17 00:00:00 2001
From: Dan O'Reilly <oreilldf@gmail.com>
Date: Sat, 13 Dec 2008 01:37:57 -0500
Subject: [PATCH] Fix some suspend/resume issues

---
 wicd/autoconnect.py | 0
 wicd/monitor.py     | 2 +-
 wicd/wicd-daemon.py | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 wicd/autoconnect.py

diff --git a/wicd/autoconnect.py b/wicd/autoconnect.py
old mode 100644
new mode 100755
diff --git a/wicd/monitor.py b/wicd/monitor.py
index 7153f9e..b875b10 100755
--- a/wicd/monitor.py
+++ b/wicd/monitor.py
@@ -231,7 +231,7 @@ class ConnectionStatus(object):
         
         # Some checks to keep reconnect retries from going crazy.
         if self.reconnect_tries > 2 and \
-           time.time() - self.last_reconnect_time < 300:
+           (time.time() - self.last_reconnect_time) < 300:
             return
 
         self.reconnecting = True
diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py
index 638247f..d40ee8a 100644
--- a/wicd/wicd-daemon.py
+++ b/wicd/wicd-daemon.py
@@ -294,7 +294,7 @@ class WicdDaemon(dbus.service.Object):
         if self.suspended:
             self.Disconnect()
         else:
-            self.forced_disconnect = False
+            self.SetForcedDisconnect(False)
 
     @dbus.service.method('org.wicd.daemon')
     def GetSuspend(self):