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

[Merge Monkey]

Merge to:

  telepathy-gabble-0.6

From:

  /home/ptlo/public_html/darcs/gabble06-backports-senko

Changes:

  Senko Rasic <senko.rasic at collabora.co.uk>
    configure.ac: check for Loudmouth>=1.3.2 and optionally enable SRV/TLS/SASL features

  Senko Rasic <senko.rasic at collabora.co.uk>
     when handling the attributes of disco <identity> elements in code, always put category before text because this is the hierachically sensible order (category -> type -> name) which they are referred to in the XEPs, schemas, debug messages, etc. otherwise people might get the arguments to gabble_disco_find_service in the wrong order or something (its called in one place - the call was right, but the function was wrong... :D) (backport from 0.7 branch, patch by Robert McQueen)

  Senko Rasic <senko.rasic at collabora.co.uk>
    elide un-necessary boolean from gabble_disco_find_service (backported from 0.7, patch by Robert McQueen)

  Senko Rasic <senko.rasic at collabora.co.uk>
    GabbleConnection: use SRV if available and if server nor port have been provided

  Senko Rasic <senko.rasic at collabora.co.uk>
    GabbleConnection: use JID that server gives us (could be different in XMPP1.0)

  Senko Rasic <senko.rasic at collabora.co.uk>
    GabbleConnection: try using TLS if possible; ignore errors unless encryption is required