[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>
    sip_media_session_request_hold() does not need the GError** parameter

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    SIPMediaChannel: prettifying

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    The initial implementation of (draft) org.freedesktop.telepathy.Channel.Interface.Hold

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    SIPMediaSession: create a new channel as send-only if the local hold state is in effect.
This prevents remotely triggered overrides of local hold by offering a new stream.