[Telepathy-commits] merge: stream-engine

[Merge Monkey]

Merge to:

  stream-engine

From:

  /home/tester/public_html/darcs-branches/stream-engine-misc-fixes-tester

Changes:

  Olivier Crete <olivier.crete at collabora.co.uk>
    Tab oops

  Olivier Crete <olivier.crete at collabora.co.uk>
    Handle BadDrawable error too

  Olivier Crete <olivier.crete at collabora.co.uk>
    Handle case when a window id is re-remove while it was being re-added, cleanup code

  Olivier Crete <olivier.crete at collabora.co.uk>
    Make remove output sink before more like remove preview sink (ie pass the window to the callback directly...)

  philippe.kalaf at collabora.co.uk
    Variable name hairdressing

  Olivier Crete <olivier.crete at collabora.co.uk>
    Do all changes on the main thread, block the src pad of the element before the tee

  Olivier Crete <olivier.crete at collabora.co.uk>
    More fixing of the way the preview window is removed on errors