[Telepathy] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

  /home/smcv/public_html/darcs/telepathy-sofiasip-multiple-media-chans

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    When closing channels, use the copy of the pointer we made, not the struct member we just NULLed

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Compile with debug by default

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Bind SIPMediaChannel pointers to NUA handles. Make sure we dissociate the media channel from the NUA handle when the channel closes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't bind Tp handles when creating NH handles

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Close parenthesis in debug messages

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't try to unref the self_handle on disconnect, the base class is responsible for that

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Support multiple media channels.
The "hmagic" associated with the NUA handles of calls is now a SIPMediaChannel*.
We avoid losing references by the Sofia stack not referencing the
SIPMediaChannel at all - instead the SIPMediaChannel unbinds itself from the
NUA handle, and marks it as expired, when it's closed or freed.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Correct sense of assertions when setting SIPMediaChannel's nua-handle property