diff options
| author | Sascha Silbe <sascha-pgp@silbe.org> | 2010-10-16 14:06:33 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha-pgp@silbe.org> | 2010-11-24 19:22:01 (GMT) |
| commit | 69dbe0fb1723b6f0402d23a19d137a3395f2f8e2 (patch) | |
| tree | 8b8b77ccfa4dd22a461bd7f381bead1d523fc0e8 /extensions/deviceicon | |
| parent | 468fe070e0a60e9690e89a0649919509c310974e (diff) | |
fix EOL spaces
Reviewed-by: James Cameron <quozl@laptop.org>
Reviewed-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
Diffstat (limited to 'extensions/deviceicon')
| -rw-r--r-- | extensions/deviceicon/battery.py | 8 | ||||
| -rw-r--r-- | extensions/deviceicon/network.py | 8 | ||||
| -rw-r--r-- | extensions/deviceicon/speaker.py | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py index edfcce4..8b1bac8 100644 --- a/extensions/deviceicon/battery.py +++ b/extensions/deviceicon/battery.py @@ -47,7 +47,7 @@ class DeviceView(TrayIcon): FRAME_POSITION_RELATIVE = 102 def __init__(self, udi): - client = gconf.client_get_default() + client = gconf.client_get_default() self._color = XoColor(client.get_string('/desktop/sugar/user/color')) TrayIcon.__init__(self, icon_name=_ICON_NAME, xo_color=self._color) @@ -105,7 +105,7 @@ class BatteryPalette(Palette): def __init__(self, primary_text): Palette.__init__(self, primary_text) - + self._level = 0 self._progress_bar = gtk.ProgressBar() self._progress_bar.set_size_request( @@ -169,7 +169,7 @@ class DeviceModel(gobject.GObject): def __init__(self, udi): gobject.GObject.__init__(self) - + bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM) proxy = bus.get_object('org.freedesktop.Hal', udi, follow_name_owner_changes=True) @@ -215,7 +215,7 @@ class DeviceModel(gobject.GObject): def do_get_property(self, pspec): if pspec.name == 'level': - return self._level + return self._level if pspec.name == 'charging': return self._charging if pspec.name == 'discharging': diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py index 0789f9c..447cad5 100644 --- a/extensions/deviceicon/network.py +++ b/extensions/deviceicon/network.py @@ -302,7 +302,7 @@ class GsmPalette(Palette): icon = Icon(icon_name='media-eject', \ icon_size=gtk.ICON_SIZE_MENU) self._toggle_state_item.set_image(icon) - + elif self._current_state == _GSM_STATE_FAILED: message_error = self._get_error_by_nm_reason(reason) self.add_alert(message_error[0], message_error[1]) @@ -406,9 +406,9 @@ class WirelessDeviceView(ToolButton): self.set_palette(self._palette) self._palette.set_group_id('frame') - self._device_props = dbus.Interface(self._device, + self._device_props = dbus.Interface(self._device, 'org.freedesktop.DBus.Properties') - self._device_props.GetAll(_NM_DEVICE_IFACE, byte_arrays=True, + self._device_props.GetAll(_NM_DEVICE_IFACE, byte_arrays=True, reply_handler=self.__get_device_props_reply_cb, error_handler=self.__get_device_props_error_cb) @@ -497,7 +497,7 @@ class WirelessDeviceView(ToolButton): digest = hash(sha_hash.digest()) index = digest % len(xocolor.colors) - self._color = xocolor.XoColor('%s,%s' % + self._color = xocolor.XoColor('%s,%s' % (xocolor.colors[index][0], xocolor.colors[index][1])) self._update() diff --git a/extensions/deviceicon/speaker.py b/extensions/deviceicon/speaker.py index 3a54464..cf06e01 100644 --- a/extensions/deviceicon/speaker.py +++ b/extensions/deviceicon/speaker.py @@ -37,7 +37,7 @@ class DeviceView(TrayIcon): FRAME_POSITION_RELATIVE = 103 def __init__(self): - client = gconf.client_get_default() + client = gconf.client_get_default() self._color = XoColor(client.get_string('/desktop/sugar/user/color')) TrayIcon.__init__(self, icon_name=_ICON_NAME, xo_color=self._color) |