[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/cassidy/public_html/darcs/telepathy-salut-cassidy

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-manager: add salut_muc_manager_ensure_tubes_channel

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: muc_connection_received_stanza_cb: check if the stanza has the right type/subtype

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: tubes_message_received: change some test as assertion

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    don't listen for the received-stanza in tubes-channel but received stanza from the text channel. Should fix #14145 on fd.o

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: fix a typo in comment. We don't use presence to announce tubes in Salut

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-manager: factor out tubes channel creation