[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpChannel: cope with API change

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    inspect-connection: cope with API change

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add weak_object parameter to async callbacks in glib-client-gen (breaks unreleased API!)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpConnection: cope with async call API change

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Actually compile media-interfaces.[ch]

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Actually check ABI

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add media interfaces to version-script.txt

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpDBusDaemon: cope with async call API change

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix up various errors in media-interfaces.c (not seen yet because it wasn't actually compiled)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Make libtelepathy-glib.la depend on version-script.txt and _gen/abi.txt so it gets relinked whenever the ABI changes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpConnectionManager: cope with async call API change