[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/sjoerd/telepathy-salut-sjoerd

Changes:

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutSelf: Properly remove old avatar data if not setting a fresh one

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Implement the Avatar interface as intended

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    When purely removing the avatar set the token to ""

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Small coding style fixes

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutContact: If the avatar tokens change while we retrieven an avatar. Restart it