[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>
    gibber-xmpp-connection.c: generate an id for stanza who doesn't have one before sending

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-channel.c: fix a typo in invitations

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add gibber IQ helper tests in check-main

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    build gibber-iq-helper.c

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

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    build check-gibber-iq-helper.c

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-transport.c: fix a GArray leak in send_data

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    move g_type_init call from tests to check-main

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-iq-helper.c: merge ObjectDestroyNotifyData to ReplyHandlerData

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix conflicts with HEAD

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    don't use global variable to store the xmpp connection and iq helper so each test is really independent

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-iq-helper.c: properly cast GibberIqHelper in GIBBER_IQ_HELPER_GET_PRIVATE macro definition

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    remove useless create_iq_helper function

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-iq-helper.c: no need to copy twice the id

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-iq-helper.c: use gibber_xmpp_connection_new_id instead of our own id generator

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    include "check-helpers.h" instead of <check-helpers.h>

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

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add gibber_xmpp_connection_new_id public method[_^[_][3~

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-iq-helper.c: s/_id/tmp