[Telepathy-commits] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

  /home/zabaluev/public_html/darcs/telepathy-sofiasip-session-fixes

Changes:

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    SIPMediaSession: while processing a remote offer, mask locally requested direction changes with the direction as set by the offer

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    Reverted a part of the last comment fix because it was a change to a worse English; I need some classes

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    SIPMediaSession: removed the unreachable state assertion in priv_request_response_step(),
because stream additions requested by the user can trigger state machine processing.

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    SIPMediaSession: remember the number of streams in the last remote offer, and exclude possible streams added after that from the answer

  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
    SIPMediaSession: improved some comment language