Async connect/disconnect. Moved everything to a new Async and Timeout which cleans...

[theonering] / src / theonering.py

diff --git a/src/theonering.py b/src/theonering.py
index a3c30d9..1e06a1d 100755 (executable)
--- a/src/theonering.py
+++ b/src/theonering.py
@@ -34,7 +34,7 @@ import constants
 import connection_manager
 
 
-IDLE_TIMEOUT = 5000
+IDLE_TIMEOUT = 5
 
 
 def run_theonering(persist):
@@ -60,10 +60,10 @@ def run_theonering(persist):
        if persist:
                shutdown_callback = None
        else:
-               gobject.timeout_add(IDLE_TIMEOUT, timeout_cb)
+               gobject_utils.timeout_add_seconds(IDLE_TIMEOUT, timeout_cb)
                shutdown_callback = quit
 
-       signal.signal(signal.SIGTERM, quit)
+       signal.signal(signal.SIGTERM, lambda: quit)
 
        try:
                manager = connection_manager.TheOneRingConnectionManager(shutdown_func=shutdown_callback)