Rework pylock to behave like xlock

1 files changed, 2 insertions, 23 deletions

diff --git a/Locker.py b/Locker.py
index 0f10fe0..5243609 100644
--- a/Locker.py
+++ b/Locker.py
@@ -24,35 +24,16 @@
 
 from gi.repository import Gtk, GLib
 
-import Idle
-
 
 class Locker(object):
-    def __init__(self, lockTimeout, doLock, doUnlock, logoutTimeout = None, doLogout = None, updateLogoutTimeout = None):
+    def __init__(self, doLock, doUnlock, logoutTimeout = None, doLogout = None, updateLogoutTimeout = None):
         self.locked = False
-        self.lockTimeout = lockTimeout
         self.logoutTimeout = logoutTimeout
         self.doLock = doLock
         self.doUnlock = doUnlock
         self.doLogout = doLogout
         self.updateLogoutTimeout = updateLogoutTimeout
 
-        if self.lockTimeout > 0:
-            GLib.timeout_add_seconds(1, self._checkLock)
-        else:
-            GLib.idle_add(self.lock)
-
-    def _checkLock(self):
-        if self.locked:
-            return False
-
-        idle = Idle.getIdleSec()
-        if (idle >= self.lockTimeout):
-            GLib.idle_add(self.lock)
-            return False
-        else:
-            return True
-
     def _checkLogout(self):
         if not self.locked:
             return False
@@ -68,7 +49,7 @@ class Locker(object):
             self.locked = True
             if not self.doLock(self.logoutTimeout):
                 self.locked = False
-                GLib.timeout_add_seconds(1, self._checkLock)
+                GLib.timeout_add_seconds(1, self.lock)
                 return False
 
             if self.doLogout is not None:
@@ -84,8 +65,6 @@ class Locker(object):
             self.doUnlock()
             self.locked = False
 
-            GLib.timeout_add_seconds(1, self._checkLock)
-
     def _canLogout(self):
         return (self.locked and self.doLogout is not None and self.currentLogoutTimeout <= 0)