[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/sjoerd/telepathy-salut-sjoerd

Changes:

  Sjoerd Simons <sjoerd at luon.net>
    SalutAvahiContact: Use a utility function to get the key/value from an avahi txt list

  Sjoerd Simons <sjoerd at luon.net>
    SalutAvahiContact: Fix STREMPTY macro and its usage

  Sjoerd Simons <sjoerd at luon.net>
    SalutAvahiContact: If retrieve_avatar is called but the avatar_token == NULL then cancel the retrieval

  Sjoerd Simons <sjoerd at luon.net>
    More coding style fixes

  Sjoerd Simons <sjoerd at luon.net>
    Coding style updates

  Sjoerd Simons <sjoerd at luon.net>
    SalutAvahiContact: Define a macro to test for empty strings

  Sjoerd Simons <sjoerd at luon.net>
    Coding style updates

  Sjoerd Simons <sjoerd at luon.net>
    Rename salut_avahi_contact_get_keyval* to _avahi_txt_get_keyval*