[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Document that the debug functions do nothing if --disable-debug was used

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Include tp_debug_set_flags() no-op stub if compiled with --disable-debug, for API/ABI compatibility

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add tp_debug_set_flags(), which doesn't accept the "persist" flag. Deprecate the related functions that did include the "persist" flag, and make the implementations more orthogonal.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add a --disable-Werror flag to configure.ac

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix --disable-Werror so it actually disables -Werror