[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 cc8584e09e3e665af75b658b8d355f1aadf4af3a
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Tue Jan 6 16:48:35 2009 +0100

    odeviced: input/idlenotifier: don't use config from controller, use singleton

diff --git a/framework/subsystems/odeviced/idlenotifier.py b/framework/subsystems/odeviced/idlenotifier.py
index b0cf0e5..2dd4f08 100644
--- a/framework/subsystems/odeviced/idlenotifier.py
+++ b/framework/subsystems/odeviced/idlenotifier.py
@@ -14,13 +14,13 @@ Known states and possible use cases:
 - "lock": not receiving input for "very long", lock the display now
 - "suspend": shut down CPU, suspend to RAM or DISK
 
-(C) 2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
-(C) 2008 Openmoko, Inc.
+(C) 2008-2009 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+(C) 2008-2009 Openmoko, Inc.
 GPLv2 or later
 """
 
 MODULE_NAME = "odeviced.idlenotifier"
-__version__ = "0.9.10.0"
+__version__ = "0.9.10.1"
 
 from helpers import DBUS_INTERFACE_PREFIX, DBUS_PATH_PREFIX, readFromFile, writeToFile
 from framework.config import config
@@ -50,7 +50,7 @@ class IdleNotifier( dbus.service.Object ):
     def instance( klass ):
         return klass._instance
 
-    def __init__( self, bus, config, index, extranodes ):
+    def __init__( self, bus, index, extranodes ):
         self.__class__._instance = self
         self.interface = self.DBUS_INTERFACE
         self.path = DBUS_PATH_PREFIX + "/IdleNotifier/%s" % index
@@ -289,7 +289,7 @@ class DisplayResource( resource.Resource ):
 #----------------------------------------------------------------------------#
 def factory( prefix, controller ):
 #----------------------------------------------------------------------------#
-    return [ IdleNotifier( controller.bus, controller.config, 0, [] ),
+    return [ IdleNotifier( controller.bus, 0, [] ),
              CpuResource( controller.bus ),
              DisplayResource( controller.bus ) ]
 
diff --git a/framework/subsystems/odeviced/input.py b/framework/subsystems/odeviced/input.py
index 9d691f6..533202c 100644
--- a/framework/subsystems/odeviced/input.py
+++ b/framework/subsystems/odeviced/input.py
@@ -2,13 +2,13 @@
 """
 Open Device Daemon - A plugin for input device peripherals
 
-(C) 2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
-(C) 2008 Openmoko, Inc.
+(C) 2008-2009 Michael 'Mickey' Lauer <mlauer at vanille-media.de>
+(C) 2008-2009 Openmoko, Inc.
 GPLv2 or later
 """
 
 MODULE_NAME = "odeviced.input"
-__version__ = "0.9.9.4"
+__version__ = "0.9.9.5"
 
 from pyglet.linux_const import EV_ABS
 from pyglet.linux import input_device_supports_event_type
@@ -46,7 +46,7 @@ class Input( dbus.service.Object, asyncworker.AsyncWorker ):
 
     action = { "key": 1, "switch": 5 }
 
-    def __init__( self, bus, config, index, node ):
+    def __init__( self, bus, index, node ):
         self.interface = self.DBUS_INTERFACE
         self.path = DBUS_PATH_PREFIX + "/Input"
         dbus.service.Object.__init__( self, bus, self.path )
@@ -163,7 +163,7 @@ def factory( prefix, controller ):
     """
     Initialize dbus plugin objects.
     """
-    return [ Input( controller.bus, controller.config, 0, "" ) ]
+    return [ Input( controller.bus, 0, "" ) ]
 
 if __name__ == "__main__":
     import dbus

-- 
FSO frameworkd Debian packaging