[Telepathy-commits] merge: telepathy-python

[Merge Monkey]

Merge to:

  telepathy-python

From:

  /home/cassidy/public_html/darcs/telepathy-python-cassidy

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    factor out stream tubes demo code to stream_tube_client.py

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    stream_tube_client.py: set "x-example" as service

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-stream-muc.py: use self.conn.dbus_proxy.bus_name instead of self.conn._dbus_object._named_service when requesting channels

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    move muc and private tubes client specific class to tube-stream-{muc,private}.py

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    stream_tube_client.py: coding style tweaks

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename {Initiator,Joiner}Client to StreamTube{Initiator,Joiner}Client

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    stream_tube_client.py: move muc specific behaviour to StreamTube{Initiator,Joiner}MucClient class

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add examples/tube-stream-private.py

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    stream_tube_client.py: pass byte_arrays=True to GetStreamTubeSocketAddress

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add examples/tube-stream-muc.py

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus: use self.conn.dbus_proxy.bus_name instead of self.conn._dbus_object._named_service when requesting channels

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    stream_tube_client.py: add StreamTubeInitiatorPrivateClient and StreamTubeJoinerPrivateClient

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    stream_tube_client.py: print a message when the joiner is waiting for a tube offer