[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/cassidy/public_html/darcs/telepathy-gabble-cassidy

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    move test-disco-no-reply.py to the slow directory

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabbletest.py: allow user to pass his own protocol to exec_test

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add test-disco-no-reply.py (re-recorded)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble_debug_set_log_file_from_env: trunc the file when opening

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    slow tests was a bad idea. All tests should be run by default

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-connection: disconnect the connection if we don't receive a reply to the discovery request

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    allow user to define his own event timeout

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    connection: lower-case disco_reply_timeout and make it static

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    run a tweaked version of Gabble with tests

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add test-disco-no-reply.py to tests set

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    run slow tests only if build with --enable-slow-tests

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    libtoolize main (renamed gabble_main) and call it from main.c

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    we don't need AC_DEFINE and AC_SUBST for --enable-slow-tests

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-disco-no-reply.py: no need to extend the timeout anymore as Gabble will timeout after 3 seconds

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tests/twisted/Makefile.am: sort TWISTED_TESTS

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-connection: allow to tweak the timeout of the disco reply (should be used only for tests)