[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>
    add  parentheses around the expansion of GIBBER_XMPP_ERROR

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    don't skip UNDEFINED_CONDITION in gibber_xmpp_error_from_node first loop

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-error: rename "action cancel" type to "cancel"

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-error: update copyright and drop @author

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-error.c: use the NS when looking for the error child

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-error: revert gint -> int useless change in gibber_xmpp_error_from_node

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    use XMPP_ERROR_UNDEFINED_CONDITION instead of XMPP_ERROR_UNKNOWN

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-error: set NS to GIBBER_XMPP_NS_STANZAS instead of NULL

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    drop INVALID_XMPP_ERROR. Use XMPP_ERROR_UNDEFINED_CONDITION instead

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    use a g_return_val_if_fail in gibber_xmpp_error_to_node

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

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    move XMPP_ERROR_UNDEFINED_CONDITION to index 0 of xmpp_errors

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add jingle errors NS

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

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add gibber-xmpp-error checks in test process

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-error: gibber_xmpp_error_to_node shouldn't accept XMPP_ERROR_UNDEFINED_CONDITION

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

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename XMPP_ERROR_JINGLE_UNKOWN_SESSION to XMPP_ERROR_JINGLE_UNKNOWN_SESSION

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-namespaces.h: add SI related NS

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    build gibber-xmpp-error