[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/cassidy/public_html/darcs/telepathy-salut-muc-bytestream-2

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename gibber_bytestream_ibb_initiation to gibber_bytestream_ibb_initiate (re-recorded)

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

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

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: generate uint8 stream-id for muc tubes

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber_bytestream_iface_send's "data" arg has to be a const

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus: use the handle-type to determine if we need SI reply or not. Remove deprecated commented code

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-bytestream-iface: remove the stream-init-id property as its 1-1 bytestream specific (re-recorded)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-bytestream-muc.c: add FIXME about futur Gibber API improvement

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-bytestream-muc.c: coding style fix

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-muc: remove useless comment

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-iface: define common bytestream properties

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename LAST_GIBBER_BYTESTREAM_STATE to NUM_GIBBER_BYTESTREAM_STATES

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    use GibberBytestreamState enum instead of GibberBytestreamIBBState

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-bytestream-iface.c: fix copyright

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-bystream-ibb: abstract using GibberBystreamIface (re-written and re-recorded)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: implement get_protocol

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: s/xmpp_connnection/xmpp_connection

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus tube-iface: use GibberBytestreamIface instead of GibberBytestreamIBB

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    use GibberBytestreamMuc for Muc D-Bus tubes (re-written and re-recorded)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: use bytestream-iface properties definitions (re-written and re-recorded)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    build gibber-bytestream-iface

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    build gibber-bytestream-muc.[ch] (re-recorded)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-muc: wrap a too long line

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-muc: remove stream_init_id as it's 1-1 bytestream specific

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-bytestream-muc.[ch]: fix file name in header