modified: ReadEtextsActivity.py

modified:   xopower.py
Correct idle timeout code.

1 files changed, 7 insertions, 8 deletions

diff --git a/xopower.py b/xopower.py
index ec03513..963e002 100644
--- a/xopower.py
+++ b/xopower.py
@@ -29,11 +29,12 @@ _logger = logging.getLogger('read-etexts-activity')
 
 # start with sleep off
 sleep_inhibit = True
+_idle_timer = 0
+_service = None
 
 def setup_idle_timeout():
     # Set up for idle suspend
-    _idle_timer = 0
-    _service = None
+    global _service
         
     fname = os.path.join('/etc', 'inhibit-ebook-sleep')
     if not os.path.exists(fname):
@@ -48,11 +49,6 @@ def setup_idle_timeout():
     else:
         logging.debug('Suspend on idle disabled')
 
-def now_active():
-    if _idle_timer > 0:
-         gobject.source_remove(_idle_timer)
-    _idle_timer = gobject.timeout_add(15000, _suspend_cb)
-
 def turn_on_sleep_timer():
     sleep_inhibit = False
     reset_sleep_timer()
@@ -61,12 +57,15 @@ def turn_off_sleep_timer():
     sleep_inhibit = True
 
 def reset_sleep_timer():
+    global _idle_timer
     if _idle_timer > 0:
         gobject.source_remove(_idle_timer)
-    _idle_timer = gobject.timeout_add(5000, _suspend_cb)
+    _idle_timer = gobject.timeout_add(5000, _suspend)
 
 def _suspend():
     # If the machine has been idle for 5 seconds, suspend
+    global _idle_timer
+    global _service
     _idle_timer = 0
     if not sleep_inhibit:
         _service.set_kernel_suspend()