[Telepathy-commits] merge: telepathy-gabble-0.4

[Merge Monkey]

Merge to:

  telepathy-gabble-0.4

From:

  /home/robot101/public_html/gabble-0.4-h263-n800-hack

Changes:

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    GabbleMediaSession: set the h263-n800-hack property on video streams with contacts who have the H263_N800_HACK capability set

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    GabbleMediaStream: add a "h263-n800-hack" construct property

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    GabblePresenceCache: set a JINGLE_H263_N800_HACK on people who have the Gabble versions released with older N800 images

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    GabbleMediaStream: when the H263-N800 hack is enabled, discard any remote codecs called H263-N800, and turn their H263-1998 into H263-N800

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    GabbleMediaStream: when the H263-N800 hack is enabled, discard any local codecs called H263-1998, and advertise H263-N800 and H263-1998