sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Browse Source
This commit is contained in:
Simon Schampijer 2007-10-18 23:59:09 +02:00
commit 099d279d7e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -1,6 +1,10 @@
* Fullscreen support (hide toolbar and tray) and tray support in activity * Fullscreen support (hide toolbar and tray) and tray support in activity
window (erikos) window (erikos)
Snapshot b023dd17a2
* Fix a crash in the emulator (marco)
Snapshot 276e1ee517 Snapshot 276e1ee517
* #4266 Avoid misleading warning every time an activity starts (smcv) * #4266 Avoid misleading warning every time an activity starts (smcv)

2
shell/hardware/hardwaremanager.py
View File

@ -45,7 +45,7 @@ class HardwareManager(object):
self._mixer = gst.element_factory_make('alsamixer') self._mixer = gst.element_factory_make('alsamixer')
self._mixer.set_state(gst.STATE_PAUSED) self._mixer.set_state(gst.STATE_PAUSED)
self._master = None
for track in self._mixer.list_tracks(): for track in self._mixer.list_tracks():
if track.flags & gst.interfaces.MIXER_TRACK_MASTER: if track.flags & gst.interfaces.MIXER_TRACK_MASTER:
self._master = track self._master = track