[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/cassidy/public_html/darcs/telepathy-gabble-cassidy

Changes:

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

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble_xmpp_error_to_node shouldn't accept XMPP_ERROR_UNDEFINED_CONDITION

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-error: make NUM_XMPP_ERRORS > XMPP_ERROR_UNKNOWN so it is *really* the number of "defined" errors

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

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-error: fix assertion in gabble_message_get_xmpp_error

  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>
    remove gabble_xmpp_error_to_g_error as we don't use it anymore

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-error: gibber_xmpp_error_from_node iterate errors backward so highest priority error will be choiced first

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-error: use the NUM_XMPP_ERRORS when iterate

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

  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>
    use gabble_message_get_xmpp_error instead of gabble_xmpp_error_to_g_error and gabble_xmpp_error_from_node

  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>
    gabble-error: update copyright and drop @author