Ticket #5867: 5867.patch

shell/model/devices/battery.py

@@ -24 +24 @@
 _LEVEL_PROP = 'battery.charge_level.percentage'
 _CHARGING_PROP = 'battery.rechargeable.is_charging'
 _DISCHARGING_PROP = 'battery.rechargeable.is_discharging'
+_PRESENT_PROP = 'battery.present'
 
 class Device(device.Device):
     __gproperties__ = {
@@ -32 +33 @@
         'charging'    : (bool, None, None, False,
                          gobject.PARAM_READABLE),
         'discharging' : (bool, None, None, False,
+                         gobject.PARAM_READABLE),
+        'present'     : (bool, None, None, False,
                          gobject.PARAM_READABLE)
     }
 
@@ -50 +53 @@
         self._level = self._get_level()
         self._charging = self._get_charging()
         self._discharging = self._get_discharging()
+        self._present = self._get_present()
 
     def _get_level(self):
         try:
+            if not self._get_present():
+                return 0
             return self._battery.GetProperty(_LEVEL_PROP)
         except dbus.DBusException:
             logging.error('Cannot access %s' % _LEVEL_PROP)
@@ -60 +66 @@
 
     def _get_charging(self):
         try:
+            if not self._get_present():
+                return False
             return self._battery.GetProperty(_CHARGING_PROP)
         except dbus.DBusException:
             logging.error('Cannot access %s' % _CHARGING_PROP)
@@ -67 +75 @@
 
     def _get_discharging(self):
         try:
+            if not self._get_present():
+                return False
             return self._battery.GetProperty(_DISCHARGING_PROP)
         except dbus.DBusException:
             logging.error('Cannot access %s' % _DISCHARGING_PROP)
             return False
 
+    def _get_present(self):
+        try:
+            return self._battery.GetProperty(_PRESENT_PROP)
+        except dbus.DBusException:
+            logging.error('Cannot access %s' % _PRESENT_PROP)
+            return False
+
     def do_get_property(self, pspec):
         if pspec.name == 'level':
             return self._level 
@@ -79 +96 @@
             return self._charging
         if pspec.name == 'discharging':
             return self._discharging
+        if pspec.name == 'present':
+            return self._present
 
     def get_type(self):
         return 'battery'
@@ -94 +113 @@
             elif change[0] == _DISCHARGING_PROP:
                 self._discharging = self._get_discharging()
                 self.notify('discharging')
+            elif change[0] == _PRESENT_PROP:
+                self._present = self._get_present()
+                self.notify('present')

shell/view/devices/battery.py

@@ -29 +29 @@
 _STATUS_CHARGING = 0
 _STATUS_DISCHARGING = 1
 _STATUS_FULLY_CHARGED = 2
+_STATUS_NOT_PRESENT = 3
 
 class DeviceView(CanvasIcon):
     def __init__(self, model):
@@ -41 +42 @@
         model.connect('notify::level', self._battery_status_changed_cb)
         model.connect('notify::charging', self._battery_status_changed_cb)
         model.connect('notify::discharging', self._battery_status_changed_cb)
+        model.connect('notify::present', self._battery_status_changed_cb)
         self._update_info()
 
     def _update_info(self):
@@ -48 +50 @@
         self.props.icon_name = name
 
         # Update palette
-        if self._model.props.charging:
+        if not self._model.props.present:
+            status = _STATUS_NOT_PRESENT
+            self.props.badge_name = None
+        elif self._model.props.charging:
             status = _STATUS_CHARGING
             self.props.badge_name = 'emblem-charging'
         elif self._model.props.discharging:
@@ -96 +101 @@
             charge_text = _('Battery discharging') + percent_string
         elif status == _STATUS_FULLY_CHARGED:
             charge_text = _('Battery fully charged')
+        elif status == _STATUS_NOT_PRESENT:
+            charge_text = _('Battery not present')
 
         self._status_label.set_text(charge_text)