[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit a6bca2e7e40d43eeb829eb6b0c352aaf1f1434f8
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Dec 4 16:30:42 2008 +0100

    resource: disable resource on object shutdown

diff --git a/framework/resource.py b/framework/resource.py
index 8fbddc0..18d043b 100644
--- a/framework/resource.py
+++ b/framework/resource.py
@@ -121,6 +121,15 @@ class Resource( dbus.service.Object ):
 
         gobject.idle_add( on_idle, self )
 
+    def shutdown( self ):
+        """
+        Called by the subsystem during system shutdown.
+        """
+        if self._resourceStatus in "enabled enabling".split():
+            # no error handling, either it works or not
+            #self._disable( lambda: None, lambda Foo: None )
+            self.Disable( lambda: None, lambda Foo: None )
+
     def _updateResourceStatus( self, nextStatus ):
         logger.info( "setting resource status for %s from %s to %s" % ( self._resourceName, self._resourceStatus, nextStatus ) )
         self._resourceStatus = nextStatus
diff --git a/framework/subsystems/odeviced/idlenotifier.py b/framework/subsystems/odeviced/idlenotifier.py
index 1bed1e4..b0cf0e5 100644
--- a/framework/subsystems/odeviced/idlenotifier.py
+++ b/framework/subsystems/odeviced/idlenotifier.py
@@ -59,6 +59,7 @@ class IdleNotifier( dbus.service.Object ):
 
         self.state = "awake"
         self.timeouts = { \
+                        "none": -1, # dummy state
                         "idle": 10,
                         "idle_dim": 20,
                         "idle_prelock": 12,

-- 
FSO frameworkd Debian packaging