[Telepathy-commits] merge: libtelepathy

[Merge Monkey]

Merge to:

  libtelepathy

From:

  /home/smcv/public_html/darcs/libtelepathy-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add a simple check for some of the backwards-compat glue (bugs.fd.o #13282)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Avoid use of some deprecated #defines in libtelepathy itself

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Compile everything except check-backwards-compat.c with -DLIBTELEPATHY_DISABLE_DEPRECATED

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix some of the backwards-compat glue (bugs.fd.o #13282)