[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

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

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    don't create the stanza if there is an error during build argument parsing

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-stanza.c: use the sub_type_names array instead of a switch to check if sub types belong to the right type

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-debug: add gibber_goto_if_reached and gibber_goto_if_fail macros

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-stanza: implement gibber_xmpp_stanza_build

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    move DEBUG_STANZA to gibber-debug

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    resolve conflict in src/debug.h due to merge with barisione's branch

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-debug.c: fix a leak in gibber_debug_stanza

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    ibber-xmpp-stanza.c: use static array instead of big switch to find subtype's name

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-im-manager: return TP_CHANNEL_FACTORY_REQUEST_STATUS_NOT_AVAILABLE when requesting a channel with a unknown contact (fix a crasher)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-stanza-build.c: test if the stanza is not NULL

  Marco Barisione <marco at barisione.org>
    Print the namespace of tags in debug_stanza

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Resolve src/debug.h

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-stanza.c: use type_names array to find the optionnal NS associated with a type

  Marco Barisione <marco at barisione.org>
    Add a DEBUG_STANZA macro to print the content of a stanza

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-stanza.c: use g_return_if_reached instead of g_assert_not_reached during stanza_build args parsing

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-stanza.c: use gibber_goto_if_reached and gibber_goto_if_fail during stanza build parsing to fix a leak

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-stanza: typedef GibberBuildTag

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-stanza.c: properly handle STREAM types

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-stanza.c: remove useless case GIBBER_STANZA_END in gibber_xmpp_stanza_build parsing

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-stanza.c: use g_slist_delete_link instead of 4 instructions doing exactly that

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-namespaces.h: add #define test to protect against multi inclusion

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add a gibber_xmpp_stanza_build simple test

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-stanza-build.c: we have to unref the stanza

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-xmpp-stanza.c: use static array instead of big switch to find type's name