Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2011-02-23 21:26:19 (GMT)
committer Simon Schampijer <simon@schampijer.de>2011-02-23 21:26:19 (GMT)
commit261dfd6de6675954fe249d23b4dc3c43c6536658 (patch)
tree5ad621bada4732f7e0c382d38c3e39816123ba98
parent30f158297d3ab6df3186145426c30263d7447af8 (diff)
parentff47b24c5aa032f830c6f3dc3ae32dfed3c72229 (diff)
Merge branch 'master' of git.sugarlabs.org:sugar/mainline
-rw-r--r--data/sugar.schemas.in2
-rw-r--r--extensions/deviceicon/battery.py10
2 files changed, 6 insertions, 6 deletions
diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
index f38b42e..b13f746 100644
--- a/data/sugar.schemas.in
+++ b/data/sugar.schemas.in
@@ -78,7 +78,7 @@
<applyto>/desktop/sugar/date/timezone</applyto>
<owner>sugar</owner>
<type>string</type>
- <default>UTC</default>
+ <default></default>
<locale name="C">
<short>Timezone</short>
<long>Timezone setting for the system.</long>
diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py
index 0d18a5f..4c1ef37 100644
--- a/extensions/deviceicon/battery.py
+++ b/extensions/deviceicon/battery.py
@@ -191,7 +191,7 @@ class DeviceModel(gobject.GObject):
def _fetch_properties_from_upower(self):
"""Get current values from UPower."""
- # pylint: disable-msg=W0201
+ # pylint: disable=W0201
try:
dbus_props = self._battery_props_iface.GetAll(_UP_DEVICE_IFACE)
except dbus.DBusException:
@@ -250,8 +250,8 @@ def setup(tray):
upower = dbus.Interface(up_proxy, 'org.freedesktop.UPower')
for device_path in upower.EnumerateDevices():
- battery = bus.get_object('org.freedesktop.UPower', device_path)
- batt_prop_iface = dbus.Interface(battery, dbus.PROPERTIES_IFACE)
- device_type = batt_prop_iface.Get(_UP_DEVICE_IFACE, 'Type')
+ device = bus.get_object('org.freedesktop.UPower', device_path)
+ device_prop_iface = dbus.Interface(device, dbus.PROPERTIES_IFACE)
+ device_type = device_prop_iface.Get(_UP_DEVICE_IFACE, 'Type')
if device_type == _UP_TYPE_BATTERY:
- tray.add_device(DeviceView(battery))
+ tray.add_device(DeviceView(device))