[Telepathy-commits] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

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

Changes:

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Really implemented Hold.GetHoldState

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    SIPMediaSession: handle unexpected stream hold state changes gracefully

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Updated the media channel implementation to the reworked Hold and CallState APIs as of 0.17.3.1.
The CallState interface helpers are provided by telepathy-glib as of 0.7.6.
This patch does not implement the specified behavior for local hold.

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    SIPMediaSession: implemented stream hold requests through StreamHandler

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Struck out the stream handler hold API.
Introduced the 'hold-state' property and the 'unhold-failure' signal on TpsipMediaChannel.

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Add the missing G_PARAM_CONSTRUCT to a property defining the default value

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Updated to the draft Hold interface as of telepathy spec 0.17.3.1