[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/sjoerd/telepathy-salut-cassidy-to-review-fixes

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel: use filters instead of directly listen the received-stanza signal

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: fix timers confusion bug

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: use increment_connection_refcount to init the refcount

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut_im_channel_add_connection: assert priv->xmpp_connection == NULL

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: add comment

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: remove remaining timer when a connection is fully open

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut_xmpp_connection_manager_remove_stanza_filter. Check if filter already exists before add it. Fix memory corruption if the callback remove the filter

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel.c: xmpp_connection_manager_new_connection_cb checks if the connection is for the right contact

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel.c: we don't need addresses and address_index anymore

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutImChannel: Start waiting for a new xmpp connection as soon as the connection backing the im channel goes away

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

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut_self_announce takes a GError as 3rd arg

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Start listening for new connections directly after the channel is created

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    remove salut_im_channel_send_stanza as we don't need it anymore thanks to XCM

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: add stanza_filter_new and stanza_filter_free

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: disconnect transport signal in disconnect_signals_foreach

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: better DEBUG messages

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: add connection refcount support

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-manager: create incoming text channel when we receive the first <message> stanza

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutXmppConnection: Make incoming connection handle from a machine with only one announce contact more in line with the normal handle. Also fixes a race condition which caused a new connection to be signaled before it was actually opened

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel.c: add the closing state

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: increment the refcount of existing connection and set it to 1 for new one (not the opposite..)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel.c: modify channel's state management to fit to the new design

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: don't send features stanza for outgoing connections

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    remove forgotten debug g_print

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-connection-listener.c unref the connection so we don't leak it if there is no listenner of the new-connection signal to unref it

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    drop salut_xmpp_connection_manager_constructor as we can create the listener in _init

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix GIBBER_XMPP_CONNECTION_CLOSE_FULLY_CLOSED flag

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    remove bytestream debug flag as we don't use it (bytestream stuffs are in Gibber)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel.c: disconnect XCM signals in xmpp_connection_manager_connection_closed_cb

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel.c: don't take the connection so XCM will automatically close it if we don't receive messages on it

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: remove connection's timer in remove_connection

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-manager: use XCM to catch invitation request

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: reset timer when we receive a stanza

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename salut_xmpp_connection_release_connection to salut_xmpp_connection_manager_release_connection and add salut_xmpp_connection_manager_take_connection

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    use SalutXmppConnectionManager to listen incoming connections

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    remove refcount timer when refcount raised 1

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection: set connection status to disconnected if salut_xmpp_connection_manager_listen failed

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix DEBUG_XCM flag

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: print the contact name in debug output when it's possible

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: open the incoming connection when there is only one contact that could be associated with it and so we consider it fully open

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel.c: request a new connection instead of raise an error if we try to send a message when the channel is closing

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-linklocal-transport.c: define GIBBER_LL_TRANSPORT_ERROR and use them in gibber_ll_transport_open_sockaddr so the error is set as expected by the caller (fix crash in XCM)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: pending_connection_got_from manages the stanza if we properly identified the connection

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-fd-transport.c: when disconnecting don't set the state if we are disposing

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    s/salut_xmpp_connection_request_connection/ salut_xmpp_connection_manager_request_connection

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: fix typo in debug messages

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: use tp_strdiff instead of strcmp

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: s/pending_connection_got_from/incoming_pending_connection_got_from

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

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager: salut_xmpp_connection_manager_listen takes now a GError** as 2nd arg

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: rename pending_connections to incoming_pending_connections

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

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: remove outgoing_pending_connection_stanza_received_cb

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    replace salut_xmpp_connection_get_connection to salut_xmpp_connection_request_connection and so wait the connection is fully open before pass it to others components

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutXmppManager: When the connection is fully closed, first remove it from the hash tables then disconned the tcp connection. Ensures we don't accidentally emit connection-failed

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: new_connection_cb: don't close the XMPP connection if we don't know the contact as we already close the transport and this connection wasn't opened anyway

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: use for loop in pending_connection_got_from

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    XCM uses its own debug flag

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutXmppConnectManager: Don't start the refcount for outgoing connections at 1

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    properly manage connection refcount with incoming connection. So if nobody care about it, the connection will be freed when its timer expired

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: add one TODO and FIXME

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

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    move connection identification from im-manager to xmpp-connection-manager

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-channel.c: tweak muc_channel_add_member to fit Collabora coding style

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    SALUT_XMPP_CONNECTION_MANAGER_GET_PRIVATE cast object to SalutXmppConnectionManager before reffing ->priv

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-manager.c: check the stanza type in invite_stanza_filter

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection.c: set the contact manager as a read only property

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: add a FIXME about incoming connections that shoudln't be announced until we receive the first stanza on it

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: connection_transport_disconnected_cb check if we are disposing to avoid to unref twice the same connection

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutImChannel: Let _intialise_connection cope with receiving stanza's form half-closed connections

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: use a for loop in contact_list_destroy

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    disconnect all signals from connection when disposing the XCM

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel.c: factor our common code in xmpp_connection_manager_connection_closed_cb and xmpp_connection_manager_connection_failed_cb

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: remove timer when got a tranport disconnected signal

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: factor out remove_connection and add few debug output

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: use g_slist_next

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    SalutXmppConnectionManager new listen for connection closing/failure and report them. IM channel now catch XCM's signal instead of those from connection

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    im-channel: don't call _initialise_connection if salut_xmpp_connection_get_connection failed

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix IBB NS

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel: salut_im_channel_add_connection ignore connection of it's the one we requested

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: add outgoing_connection_timeout_data_new ()

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: add debug messages

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut_xmpp_connection_request_connection now check if the connection isn't closing. If it is, wait this connection is closed before requesting a new one

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-channel.c: set contact as remote_pending when we invite him

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: emit the closed signal before call check_if_waiting_for_connection_closed

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    incoming_pending_connection_stream_opened_cb: check if version == 1.0 before send features stanza

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    XCM set a timer on outgoing connection and fire the connection-failed signal if it expires

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-connection.c: add CLOSE flags

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    assert salut_xmpp_connection_manager_new arguments

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel.c: reset connection timer when we send a stanza trought it

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager: add the connection in the hash table and connect signals when we create a new connection

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection.c: don't set the G_PARAM_CONSTRUCT_ONLY to the contact manager property as it's a ro property

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: add few contact != NULL asserts

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    set a timer instead of immediately close the connection when its refcount fails to 0

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel.c: connection_disconnected: remove useless dispose_has_run check and set xmpp connection to NLL after removing the filters

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: don't keep a ref on the SalutConnection as it keep as ref on the XCM

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: create_new_outgoing_connection return a specif GError if we can't find addresse for the contact

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutImChannel: Remove connected and received-stanza signalling, their obsoleted by the XmppConnectionManager

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-channel.c: don't call _error_flush_queue when connection is gracefully closed

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    Muc now use XCM for handling invitations

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-xmpp-connection-manager.c: pending_connection_got_from doesn't handle the stanza (if any) now. Let's the called do that if needed

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    move connection creation from im-channel to xmpp-connection-manager

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut_xmpp_connection_request_connection now checks if there is an existing pending incoming/outgoing connection before create a new one