[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>
    Generate a header containing all of libtelepathy's public API and check that it can be included in a file that also includes all of telepathy-glib's public API

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    libtelepathy 0.3.1

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Turn off -Werror in everything_CFLAGS now I know it works

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Instead of using our own copy of the whitelisted interface declarations/macros, use tp-glib's

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use $(srcdir) for whitelist.txt, deprecated.txt

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Split "whitelisted" (= tp-glib) constants away from deprecated ones.
Use <telepathy-glib/enums.h> to get enums.
Don't bother generating interfaces and enums that already exist in tp-glib at all.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Sync c-constants-generator, c-interfaces-generator from telepathy-glib 0.7.0

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Move check-backwards-compat to new directory src/check-compat/ and add tests that all headers are individually includable *without* LIBTELEPATHY_DISABLE_DEPRECATED (we know they're includable *with* that symbol, because of src/*.c)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add machinery for splitting interfaces into supported and deprecated. Compile all code from the combined list for now

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Version 0.3.1 (libtool c:r:a = 8:0:6)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Re-order configure.ac so we set $PKG_CONFIG before trying to use it

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update spec to 0.17.0

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Make src/ before src/check-compat/

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Require telepathy-glib 0.7.0, and use *its* version of tp_get_bus(), tp_get_bus_proxy() and the stable tp_iface_quark_* functions

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Change some header guards to LIBTELEPATHY_* to avoid possible conflicts with telepathy-glib

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Correct .pc file

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Link against telepathy-glib 0.6.x (only!); remove our version of tp_get_bus(|_proxy) in favour of using telepathy-glib's

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Do all checking for libraries at once

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Development version 0.3.1.1

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use the spec's copy of Channel_Handler, not ours

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Split interface quark code into deprecated and whitelisted interfaces

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix check-compat for out of tree builds

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Separate generation of tp-glib-like interface (quark) stuff from generation of libtp aliases

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Generate LIBTELEPATHY_DISABLE_DEPRECATED guards around the old interface quark names