[Telepathy-commits] merge: telepathy-salut-0.2

[Merge Monkey]

Merge to:

  telepathy-salut-0.2

From:

  /home/sjoerd/telepathy-salut-0.2-sjoerd

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection: coding style fix

  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>
    SalutConnection: Implement GetKnownAvatarTokens

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutConnection: Implement RequestAvatars

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

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut_connection_request_avatars: unref the contact after the salut_contact_get_avatar call

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    SalutConnection, emit AvatarUpdated when our own avatar is set

  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>
    SalutContact: If the avatar tokens change while we retrieven an avatar. Restart it