[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>
    checkify node properties tests

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix test-xmpp-node-properties.c header

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-util.c: use g_critical instead of g_debug in set_child_from_property

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    create salut-util.[ch] containing salut_gibber_xmpp_node_extract_properties and salut_gibber_xmpp_node_add_children_from_properties

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    reimplement gibber_debug_stanza to use gibber_xmpp_node_to_string

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add test-xmpp-node-properties.c

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    build salut-util.c

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-channel.c: use text_helper_create_message_groupchat instead of text_helper_create_message

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    text-helper: add text_helper_create_message_groupchat

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    build test-xmpp-node-properties.c

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-stanza.c: fix an argument error in gibber_xmpp_stanza_build documentation

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix conflict in tests/Makefile.am

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-stanza-build.c: move g_type_init and debug init to main

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