[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/cassidy/public_html/darcs/telepathy-salut-tubes

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-manager.c: properly send IQ error in si_request_cb

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: don't announce stream tubes we didn't initiate

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    implement AcceptStreamTube and GetStreamTubeSocketAddress

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: check if we have to publish the tube *before* adding the <tube> markup

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-obb: close the bytestream if an error occurs when writing to the socket

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-obb: add a write buffer

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: properly decline bytestream if a GError is passed

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: add stream tubes in GetAvailableStreamTubeTypes result

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: use GibberTransport instead of reimplementing our own

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-manager.c: unref the bytestream *after* the call to gibber_bytestream_iface_close

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: make normalize_address more portable

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add bytestream-manager debug flag

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection: instantiate the bytestream mgr

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: when creating a new stream tube, set its initiator according to the contact who sent us the tubes messages

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-manager: the free of host_name_fqdn have to be done in the finalize, not dispose

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: remove usless return in xmpp_connection_received_stanza_cb

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Ignore OOB close stanza - it doesn't make sense for OOB TCP streams that we implement internally, and that's all we currently support

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channe: remove 1-1 tubes commented code

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    build salut-bytestream-manager

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut_tubes_channel_bytestream_offered

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: coding style fix

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: add dispose_has_run

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: call set_transport before connect and open_fd so we don't have to check for the state

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    remove the offering parameter from extract_tube_information

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename parse_oob_close_iq to parse_oob_iq_result

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: don't expect transport's connect is synchronous

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: ref the xmpp-connection and disconnect its signal when disposing

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-iq-helper.c: add a TODO in gibber_iq_helper_new_error_reply

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut-bytestream-manager.[ch]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-stream: use GibberTransport instead of reinventing our own

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb.c: inline send_stanza

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: explicitely say in the host parameter description than it have to be a hostname, not a literal

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: don't bufferize data. Let the higher layer do that

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add gibber-bytestream-oob.[ch]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add a "host-name-fqdn" property to the bytestream-mananager so we use the host name from avahi_client_get_host_name_fqdn in OOB bytestreams

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    drop gibber_bytestream_iface_get_protocol. Use a property instead

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    start to implement OfferStreamTube (muc only for now)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: drop muc support

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut_muc_manager_handle_si_stream_request

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: close the bytestream if the transport is disconnected

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    modify gibber_iq_helper_new_error_reply to take a XmppError and a error msg as arguments

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: send item-not-found error if connect to peer failed

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: add a FIXME in parse_oob_iq_result

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: close the transport when disposing the bytestream

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: add unix and inet sockets in GetAvailableStreamTubeTypes result

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    change bytestream_iface_accept API. The bytestream is now responsible of creating and sending the SI accept stanza

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-manager.c: backport streaminit_parse_request improvements from Gabble

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-bytestream-manager.c: use gibber_bytestream_oob_set_check_addr_func to check if the addr is owned by the right contact

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    build tube-stream

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    remove a test g_print

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix stanza leak in gibber_bytestream_oob_accept

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: remove the request attribute in the call of update_tubes_info in salut_tubes_channel_accept_stream_tube

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    check-gibber-iq-helper.c: update to use new gibber_iq_helper_new_error_reply API

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: don't force the stream-id attribute in muc presence

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: salut_tubes_channel_bytestream_offered: close the bytestream if there is an error

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add a GError argument to gibber_bytestream_iface_close as in Gabble (not used yet)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-manager: remove double break

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-stream: remove useless blank line

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-manager.c: salut_muc_manager_handle_si_stream_request: close the bytestream if the tubes channel doesn't exist

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add gibber_bytestream_oob_set_check_addr_func to let bytestream user define a function to check if he want to accept a incoming connection or not

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add GIBBER_TELEPATHY_NS_RMULTICAST namespace and use it in bytestream-muc

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    build gibber-bytestream-oob

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-manager: remove unnecessary casts from (gchar *) to (const gchar *)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix confict with -protocol and make it build

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-manager.c: improve parsing in si_request_reply_cb

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add tube-stream.[ch]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: remove temporary buffer in data_io_in_cb

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: add a TODO about IPv6 literals in URL

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    allow func argument of gibber_bytestream_{oob,ibb}_accept to be NULL

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut_tubes_channel_get_stream_tube_socket_address: don't hardcode unix type

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-manager: assert host_name_fqdn is not NULL in constructor

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: use gibber-util's normalize_address instead of our own copy

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: extract_tube_information: allow initiator to be NULL

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: send the IQ response only if we are the recipient of the bytestream

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-manager: unref the bystream when it's closed. It's the responsibilty of the object using it to ref it

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-stream: create the transport when the bystream is open as we are not able to handle data before

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: normalize_address was renamed to gibber_normalize_address