[Telepathy-commits] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

  /home/smcv/public_html/darcs/tp-sofiasip-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>
    Change behaviour of SOFIASIP_DEBUG and SOFIASIP_PERSIST to match recent Gabble.
SOFIASIP_DEBUG now controls debug logging only, not persistence.
SOFIASIP_PERSIST controls persistent mode but does not enable extra debug logs.
Depend on telepathy-glib 0.6.1 to achieve this (it could be made conditional,
like in Gabble, but 0.6.1 has been out for a while so I don't think it's
necessary).

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Bump nano version to 1 to indicate post-0.5.0 development