[Telepathy-commits] merge: telepathy-haze

[Merge Monkey]

Merge to:

  telepathy-haze

From:

  telepathy-haze-resiak

Changes:

  Will Thompson <will.thompson at collabora.co.uk>
    Emit Sent from haze_write_im rather than from im_channel_send; DEBUG ignored messages.

  Will Thompson <will.thompson at collabora.co.uk>
    Emit the best approximation of SendError currently possible with libpurple

  Will Thompson <will.thompson at collabora.co.uk>
    add a DEBUG macro that adds the calling function's name, and a haze_debug function wrapping g_debug

  Will Thompson <will.thompson at collabora.co.uk>
    Pass messages written to CONV_TYPE_IMs with write_conv up to haze_write_im so they don't get ignored.

  Will Thompson <will.thompson at collabora.co.uk>
    Reduce debug chatter from libpurple

  Will Thompson <will.thompson at collabora.co.uk>
    Report found protocols on a single line rather than on one line each.

  Will Thompson <will.thompson at collabora.co.uk>
    Use DEBUG rather than using g_debug directly