[Telepathy-commits] merge: stream-engine

[Merge Monkey]

Merge to:

  stream-engine

From:

  /home/robot101/public_html/stream-engine-rob

Changes:

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    rather than doing strange acrobatics to work out whether the unlink callback has been called already, don't add it if it's already been added

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    don't set audio src or sink elements on the farsight stream when maemo support is enabled, unless FS_AUDIO_{SRC,SINK} env vars are set

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    whitespace changes