[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>
    when searching for MUC servers in disco responses, only find those with type="conference" category="text" to avoid false-positives of stuff like IRC gateways

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    factor out the disco type -> xmlns function so we can deal with <disco:query xmlns:disco="..."> stanzas

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    fix thinko in media codec emission in SetRemoteCodecs, set the type based on the stream's type