[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>
    elide un-necessary boolean from gabble_disco_find_service

  Robert McQueen <robert.mcqueen 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)