From 261dfd6de6675954fe249d23b4dc3c43c6536658 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Wed, 23 Feb 2011 21:26:19 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:sugar/mainline

---
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))
--
cgit v0.9.1