[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/cassidy/public_html/darcs/telepathy-salut-uninvite

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    revoke invites when we remove an activity due to a SetActivity call instead of using the muc closed signal

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    forget about invites when we join the room

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    check room handle in salut_contact_left_private_activity

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection: catch uninvite stanza and remove the contact from the activity

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix OLPC disabled build

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add a FIXME about salut_contact_takes_part_in_olpc_activity

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self: send uninvite stanza when we leave a muc associated with an activity

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add 2 debug output + coding style tweaks

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact: add salut_contact_left_private_activity public method

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add debug in muc_ready_cb