[Telepathy-commits] merge: telepathy-gabble-0.6

[Merge Monkey]

Merge to:

  telepathy-gabble-0.6

From:

  /home/smcv/public_html/darcs/gabble-0.6-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    When using GABBLE_PERSIST, set all Gabble debug flags as well as all tp-glib flags

  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>
    Backport "Use tp_debug_set_flags() if available, to separate 'persist' from the rest of the debug flags" from HEAD to 0.6.x.
In 0.6.x we want to stay compatible, so make GABBLE_PERSIST imply
GABBLE_DEBUG=all.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix coding style in test-parse-message.c to fix `make check`