1 --- batterymon.py 2009-05-01 07:14:37.000000000 -0400
2 +++ batterymon.py 2011-10-19 17:51:53.000000000 -0400
4 charge_level = self.__battery.GetProperty('battery.charge_level.percentage')
5 logger.debug("battery.percentage: %s" % str(charge_level))
8 - remaining_time = self.__battery.GetProperty('battery.remaining_time')
9 - logger.debug("battery.remaining_time: %s" % str(remaining_time))
11 - except dbus.DBusException, e:
14 + if self.__battery.GetProperty('battery.rechargeable.is_discharging'):
16 + remaining_time = self.__battery.GetProperty('battery.remaining_time')
17 + logger.debug("battery.remaining_time: %s" % str(remaining_time))
19 - remaining_time = self.__str_time(remaining_time)
20 + except dbus.DBusException, e:
24 + remaining_time = self.__str_time(remaining_time)
28 if self.property_modified_handler:
29 self.property_modified_handler(BatteryInfo(charge_level, remaining_time, is_charging, is_discharging, present))