[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv-trivia

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    servicetest: log complete errors, not just the repr()

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix "make check" in tests: stop trying to grep the now-removed check-extra files. Do run style checks on the twisted tests, though.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    _boring: add *.rej and src/gabble-signals-marshal.h

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't tp_get_bus_proxy() in gabble_vcard_manager_dispose (why was this ever here?!)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add gabble_message_get_xmpp_error(); make gabble_xmpp_error_to_g_error() always return *something* for code simplification

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble-connection.c: index() is not ISO C, use strchr()

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    base64_encode(): don't assume that the gchar * is NUL-terminated