[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 code to detect the N800's OS2006 version of Gabble

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    remove default value for "port" parameter

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    don't pass the port in at all if it's not specified, it defaults to 5222 inside loudmouth

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    if we don't have SRV support in loudmouth, don't defend against the server mysteriously being set anyway

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    remove 'auth-mac' and 'auth-btid' properties, specific to long-dead Nokia Instant Video Call service

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    restore old behaviour of taking the server from the JID when old SSL is used, disabling any LM srv lookup code, otherwise the port number will be ignored when making an old SSL connection (fixes fd.o #13816)

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    correct comment; we don't set the port in this case

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    remove Nokia Instant Video specific device registration code

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    remove the H263 N800 hack; in light of RFC 4629, the behaviour of not enabling any H263 annexes unless specifically negotiated is in fact entirely correct, and this behaviour is now implemented in recent versions of Farsight when negotiating the H263-1998 payloading

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    remove code to enable h263-n800-hack when calling old OS2006 N800s

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    if a "server" or "port" parameter are specified, disable SRV lookups and use the given values (falling back to the JID domain for the server, or 5222 for the port, if only one or the other is specified)