[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/robot101/public_html/telepathy-gabble-rob

Changes:

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    remove #if 0'd hacky _presence_node_has_google_voice function which has been unused from 0.3.x days

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    correct _gabble_media_channel_typeflags_to_caps and _gabble_media_channel_caps_to_typeflags to match the semantics of _gabble_media_session_request_streams when deciding what stream types are available.
Specifically, a) we must have GTalk-P2P transport available in order to place
/any/ calls because it is the only transport we can signal atm, b) any 3rd
party with Google voice capability is always audio callable, and c) to make
Jingle audio/video calls to 3rd parties, they must also support Jingle and
GTalk-P2P. Fixes #15656.

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    avoid duplicating the required PRESENCE_CAP_* for a person to be callable
by calling _gabble_media_channel_caps_to_typeflags instead (this just applies
to the trivial checking in AddMembers, only relevant when using the
pre-0.17.2 spec method of adding the member before requesting streams is being
used)

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    add a note to _gabble_media_session_request_streams reminding people to also check that _gabble_media_channel_typeflags_to_caps and _gabble_media_channel_caps_to_typeflags are kept up to date