[Telepathy-commits] merge: telepathy-haze

[Merge Monkey]

Merge to:

  telepathy-haze

From:

  telepathy-haze-resiak

Changes:

  Will Thompson <will.thompson at collabora.co.uk>
    Check whether libpurple was built with dbus support before trying to call purple_dbus_uninit
Also, work around libpurple/dbus-server.h being unincludable in old
libpurples by prototyping purple_dbus_uninit in main.c if necessary.