[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone5.1

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit d360d222300382a9174335aa93ff24f85cd6b9c4
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Wed Feb 4 01:22:55 2009 +0100

    odeviced: kernel26: do not send capacity changes for AC adapters

diff --git a/framework/subsystems/odeviced/kernel26.py b/framework/subsystems/odeviced/kernel26.py
index 342dacb..0339135 100644
--- a/framework/subsystems/odeviced/kernel26.py
+++ b/framework/subsystems/odeviced/kernel26.py
@@ -8,7 +8,7 @@ GPLv2 or later
 """
 
 MODULE_NAME = "odeviced.kernel26"
-__version__ = "0.9.9.7"
+__version__ = "0.9.9.8"
 
 from helpers import DBUS_INTERFACE_PREFIX, DBUS_PATH_PREFIX, readFromFile, writeToFile, cleanObjectName
 from framework.config import config
@@ -217,11 +217,6 @@ class PowerSupply( dbus.service.Object ):
         logger.info( "%s %s initialized. Serving %s at %s" % ( self.__class__.__name__, __version__, self.interface, self.path ) )
         self.node = node
 
-        capacityCheckTimeout = config.getInt( MODULE_NAME, "capacity_check_timeout", 60*5 )
-        self.capacityWatch = gobject.timeout_add_seconds( capacityCheckTimeout, self.onCapacityCheck )
-        # FIXME should this rather be handled globally (controller issuing a coldstart on every subsystem)? Yes!
-        gobject.idle_add( self.onColdstart )
-
         self.powerStatus = "unknown"
         self.online = False
         self.capacity = -1
@@ -231,6 +226,10 @@ class PowerSupply( dbus.service.Object ):
         # get polling-free battery notifications via kobject/uevent
         if self.isBattery:
             KObjectDispatcher.addMatch( "change", "/class/power_supply/%s" % node.split('/')[-1], self.handlePropertyChange )
+            capacityCheckTimeout = config.getInt( MODULE_NAME, "capacity_check_timeout", 60*5 )
+            self.capacityWatch = gobject.timeout_add_seconds( capacityCheckTimeout, self.onCapacityCheck )
+            # FIXME should this rather be handled globally (controller issuing a coldstart on every subsystem)? Yes!
+            gobject.idle_add( self.onColdstart )
 
     def isPresent( self ):
         present = readFromFile( "%s/present" % self.node )

-- 
FSO frameworkd Debian packaging