[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add test-alias-pep.py to Makefile.am (recorded separately to reduce conflicts)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    conn-aliasing: implement negative caching

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update test-alias-empty-vcard.py to cope with PEP aliases

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add test-alias-pep.py: testing that aliases can be fetched from PEP

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Avoid requesting vCards if we already have them cached, which trips an assertion

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-alias.py: improve namespace assertions, cope with attempted PEP alias fetching

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Move PEP <nick> handling to conn-aliasing

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Handle PEP errors correctly

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove unnecessary check

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Explicitly look up PEP nicknames when looking for aliases, before requesting the vCard

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    conn-aliasing: [cosmetic] avoid complicated assign-on-declare

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-vcard-cache.py: cope with PEP alias support (unfortunately this triggers an assertion somewhere in the vCard code)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't re-request the vCard if we have it cached already

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    [cosmetic] newline before block

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    servicetest: allow verbosity to be enabled via environment