diff options
| author | Martin Dengler <martin@martindengler.com> | 2008-06-04 02:43:59 (GMT) |
|---|---|---|
| committer | Martin Dengler <martin@martindengler.com> | 2008-06-10 08:06:53 (GMT) |
| commit | 550aa20e5f2672c1f47f07fdd47ece9e1dcf1d16 (patch) | |
| tree | aca5d5ba2aba34bf2fa952cd4282a926ceb7c63d /src/model | |
| parent | b05f3a82a2c088bc677c40d506eb86d3c9b7f450 (diff) | |
speaker-icon tidyups
- set_mute --> set_muted, consistent with get_muted()
- return 0, not None, if we can't get the mixer volume
- removed overly-verbose traceback printing in devicesmodel.py
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/devices/devicesmodel.py | 2 | ||||
| -rw-r--r-- | src/model/devices/speaker.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/model/devices/devicesmodel.py b/src/model/devices/devicesmodel.py index 3a83c9d..f328109 100644 --- a/src/model/devices/devicesmodel.py +++ b/src/model/devices/devicesmodel.py @@ -18,7 +18,6 @@ import logging import gobject import dbus -import traceback from model.devices import device from model.devices.network import wireless @@ -52,7 +51,6 @@ class DevicesModel(gobject.GObject): except Exception, speaker_fail_msg: logging.error("could not initialize speaker device: %s" % speaker_fail_msg) - logging.debug(traceback.format_exc()) def _observe_hal_manager(self): bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM) diff --git a/src/model/devices/speaker.py b/src/model/devices/speaker.py index 8526ea3..683849d 100644 --- a/src/model/devices/speaker.py +++ b/src/model/devices/speaker.py @@ -40,7 +40,7 @@ class Device(device.Device): return self._manager.get_muted() def _set_muted(self, mute): - self._manager.set_mute(mute) + self._manager.set_muted(mute) self.notify('muted') def get_type(self): |