[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

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

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-muc-channel.c: add 3rd argument to create_presence_message so we can get a pointer to <x> if we want

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-factory: be sure to don't use _gabble_connection_send_iq_error in reply to a non-iq stanza

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus: identation fix

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: remove init of block_size as it will be done by the property constructor

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-factory.c: identation fix

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-factory: indentation fix

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: check if base64_decode doesn't return NULL

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: set the G_PARAM_CONSTRUCT flag to the block-size property so it will be properly initialized

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    private-tubes-factory.c: identation fix

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-factory: make SI reply parsing more robust

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel.c: fix 2 trivial space bugs

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-muc: check if base64_decode doesn't return NULL

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    simplify gabble_tubes_channel_init

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix declaration style in few tubes related headers

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-factory: fix a typo + header declaration style

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: set default param string value to NULL instead of ""

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    simplify gabble_bytestream_factory_init

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    simplify gabble_bytestream_ibb_init

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    use "%zu" as format when printing gsize (thanks to Alban Crequy)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-factory.c: use _gabble_connection_send_iq_error and _gabble_connection_acknowledge_set_iq in handle_ibb_close_iq

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    simplify gabble_tube_dbus_init

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: add dispose_has_run

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-muc: add dispose_has_run

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    sha1_bin 3rd argument have to be "guchar" instead of "gchar"

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: gabble_bytestream_ibb_accept: use g_object_set to change the state the the state-changed signal is emitted