[pkg-fso-commits] [SCM] framworkd debian packageing branch, master, updated. milestone2-110-g76700a0

[Jan Luebbe]

The following commit has been merged in the master branch:
commit 13e4a528db1c06929ae6e52363de43ce6c772bec
Author: Jan Luebbe <jluebbe at debian.org>
Date:   Wed Aug 27 17:09:39 2008 +0200

    ousaged: add more information to the ResourceChanged signal

diff --git a/ChangeLog b/ChangeLog
index 3aae1c0..a879607 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-27	Jan Luebbe      <jluebbe at debian.org>
+
+	* [ousaged] The ResourceChanged signal now contains more information
+
 2008-08-27	Michael Lauer	<mickey at openmoko.org>
 
 	* [odeviced] Implement power status notifications using netlink socket
diff --git a/framework/subsystems/ousaged/generic.py b/framework/subsystems/ousaged/generic.py
index 0327d1c..875e3e7 100644
--- a/framework/subsystems/ousaged/generic.py
+++ b/framework/subsystems/ousaged/generic.py
@@ -53,21 +53,27 @@ class AbstractResource( object ):
             assert policy in ['auto', 'enabled'], "Can't change to policy %s for %s" % ( policy, self.name )
         if self.policy != policy:
             self.policy = policy
-            self.usageControl.ResourceChanged( self.name )
             self._update()
+            self.usageControl.ResourceChanged(
+                self.name, self.isEnabled, {"policy": self.policy, "refcount": len( self.users )}
+            )
 
     def request( self, user ):
         assert self.policy in ['auto', 'enabled'], "Request for %s is not allowed" % ( self.name )
         assert user not in self.users, "User %s already requested %s" % ( user, self.name )
         self.users.append( user )
-        self.usageControl.ResourceChanged( self.name )
         self._update()
+        self.usageControl.ResourceChanged(
+            self.name, self.isEnabled, {"policy": self.policy, "refcount": len( self.users )}
+        )
 
     def release( self, user ):
         assert user in self.users, "User %s did non request %s before releasing it" % ( user, self.name )
         self.users.remove( user )
-        self.usageControl.ResourceChanged( self.name )
         self._update()
+        self.usageControl.ResourceChanged(
+            self.name, self.isEnabled, {"policy": self.policy, "refcount": len( self.users )}
+        )
 
     def cleanup( self, user ):
         if user in self.users:
@@ -198,8 +204,8 @@ class GenericUsageControl( dbus.service.Object ):
     #
     # dbus signals
     #
-    @dbus.service.signal( DBUS_INTERFACE, "s" )
-    def ResourceChanged( self, resourcename ):
+    @dbus.service.signal( DBUS_INTERFACE, "sba{sv}" )
+    def ResourceChanged( self, resourcename, state, attributes ):
         pass
 
 #----------------------------------------------------------------------------#

-- 
framworkd debian packageing