[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/ptlo/public_html/darcs/gabble-caps-update-senko

Changes:

  Senko Rasic <senko.rasic at collabora.co.uk>
    presence-cache.c: emit capabilities update only once after all caps uris have been processed

  Senko Rasic <senko.rasic at collabora.co.uk>
    fixed merge conflicts

  Senko Rasic <senko.rasic at collabora.co.uk>
    test-caps-update.py: make it clear that we don't depend on gabble version for the test

  Senko Rasic <senko.rasic at collabora.co.uk>
    presence-cache.c: simplify presence change detection, ensure we use newly created presence

  Senko Rasic <senko.rasic at collabora.co.uk>
    added test for CapabilitiesChanged signal emission