[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/cassidy/public_html/darcs/telepathy-salut-cassidy-to-review

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix conflicts. Use auto-generated marshallers magic

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-connection-listener.c: rename normalize_to_ipv4 to normalize_to_address

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    debug.c: add DEBUG_IM

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-connection-listener: pass the addrinfo size with the new-connection signal

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-connection-listener: NEW_CONNECTION signal gives a ptr to the sockaddr

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix typo in gibber-fd-transport.c debug message

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-connection-listener: simplify error codes

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-connection-listener.c: normalize IPv6 address to IPv4 if needed

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add check-gibber-xmpp-connection-listener.c

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber_xmpp_connection_listener_listen now takes the port and a GError as arguments and returns a boolean

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    check-gibber-xmpp-connection-listener: no need to create a XMPP connection in connect_to_port

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-connection-listener.c: check if errno == EADDRINUSE before return the error

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    check-gibber-xmpp-connection-listener: check the type of error when gibber_xmpp_connection_listener_listen fails

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