[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>
    test-si-tubes: use watch_tube_signals instead of our own copy of it

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add test-get-available-tubes.py to tests suite

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-iface: gabble_bytestream_iface_accept now take a function ptr instead of the whole stanza (as in Salut)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-accept-stream-tube-ibb.py: check if we received the right data on the socket

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: stop to implement gabble_bytestream_iface_get_protocol

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-iface: remove gabble_bytestream_iface_get_protocol

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-get-available-tubes.py: remove useless import

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: implement new gabble_bytestream_iface_accept API

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-accept-stream-tube-ibb.py: move protocol.queue initiation to the got_protocol cb

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-si-tubes.py: make test actually works

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus: use new gabble_bytestream_iface_accept API

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    servicetest.py: add watch_tube_signals function

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-stanza: check SI reply stanza

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-tubes.py: port to new test API

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-stream: use new gabble_bytestream_iface_accept API

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabbletest.py: add message_type attribute to stream-message

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-offer-stream-tube-ibb.py: remove D-Bus tube test

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-iface: add "protocol" properties

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: add a FIXME about AcceptDBusTube broken with 1-1 tubes

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    servicetest.py: add EventProtocol class that raise Event when data are received from a protocol (useful for stream tubes tests)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-muc: implement "protocol" properties

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    servicetest.py: add EventProtocolFactory

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-accept-stream-tube-ibb.py: remove useless ClientCreator instantiation

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename test-muc-tubes.py to test-muc-offer-stream-tube-ibb.py

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename tube_conn parameter of watch_tube_signals to "tube"

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add test-muc-offer-dbus-tube.py

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add test-muc-accept-stream-tube-ibb.py

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-muc: implement new gabble_bytestream_iface_accept interface

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-offer-dbus-tube.py: add few more assertions

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-si-tubes: various cleanup and improvements

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-si-tubes.py: port to new test API

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabbletest.py: enable verbose output when using the new API and CHECK_TWISTED_VERBOSE is defined

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename EventProtocolFactory to EventProtocolClientFactory

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb.c: debug flag have to "bytestream" not "tubes"

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-get-available-tubes.py: remove debug print

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-offer-stream-tube-ibb.py: remove unused imports

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-offer-stream-tube-ibb.py: use EventProtocolFactory

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-accept-stream-tube-ibb.py: remove unused imports

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-offer-dbus-tube.py: remove unused imports

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    namespaces.h: add NS_OOB

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    servicetest.py: define EventProtocolClientFactory using multi inheritance

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    move sendMessage method to EventProtocol::sendData

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-accept-stream-tube-ibb.py: remove useless debug test

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-muc: stop to implement gabble_bytestream_iface_get_protocol

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus: add a <tube> node to SI reply

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-tubes: replace some assertions by expect keywords

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabbletest.py: use make_stream_event when installing stream-message observer

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-si-tubes: check SI reply stanza

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: add the bug number about AcceptDBusTube broken with 1-1 tube

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-get-available-tubes.py: remove unused imports

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-tubes: more test cleanup

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tests/Makefile.am: update after test-muc-tubes.py split

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: add more information in debug output when the stream is accepted

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-accept-stream-tube-ibb.py: remove now useless gotProtocol callback

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    servicetest.py: remove unused dbus import

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add test-muc-accept-stream-tube-ibb.py to tests suite

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-tubes: use message_type keyword instead of an assertion

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add socket-connected event so we can properly wait for our socket to be connected

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-si-tubes.py: remove unused import

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-si-tubes.py: test joiner side of 1-1 D-Bus tubes

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: implement "protocol" properties

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add test-get-available-tubes.py

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-accept-stream-tube-ibb.py: be sure "socket-data" event is about the right protocol object