[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/smcv/public_html/darcs/salut-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Cope with TpChannelIface channel-type property becoming writeable in telepathy-glib > 0.7.0, avoiding warnings when channels are constructed (fd.o #13896).
If telepathy-glib is <= 0.7.0, the added code will never execute, but is
harmless.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    When ignoring an attempt to set a tubes channel's type, assert that the desired value is either NULL or TP_IFACE_CHANNEL_TYPE_TUBES

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Assert that room lists have type ROOM_LIST, not TEXT