[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>
    add missing method return to StopListing method on the room list channel

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    don't process <c> or <x xmlns="vcard-temp:x:update"> nodes in incoming <message> stanzas, both aren't specified in the relevant XEPs, and we don't send them anyway...

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    don't process incoming <nick> elements if we receive a <message type="error">, otherwise we can confuse our nick with the erroneous contact's

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    GabbleRoster: when creating new items, if we have any nickname info for a contact which isn't just part of the JID, store it in the item

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    fix whitespace

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    fix avatars so that a missing <TYPE> node gives an empty type string, not an error