[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

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

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self: update_activity_privacy have to be static

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self: send_olpc_activity_properties_changes_msg: convert GError to a TP_ERROR

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self: update_activity_privacy: convert GError to a TP_ERROR