[Telepathy-commits] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

  /home/zabaluev/public_html/darcs/telepathy-sofiasip-glare

Changes:

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    SIPMediaChannel: have the session resolve glare on a 491 response

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Introduced a new session state, 'reinvite-pending', as the way to resolve glare conditions on re-INVITE

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Ported the glare fix to trunk

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    TpsipMediaChannel: don't accept the session on non-2xx status codes when NUA state changes to ready.
That case is awaiting another patch.

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    TpsipMediaChannel: revert to handling call termination in the nua_i_state handler, not in nua_i_terminated.
The latter is deprecated. tpsip_media_channel_peer_error() is again just a function to report the response,
not terminating the session itself.