[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/ptlo/public_html/darcs/gabble-presence-senko

Changes:

  Senko Rasic <senko.rasic at collabora.co.uk>
    gabble_presence_pick_resource_by_caps: simplified resource comparison

  Senko Rasic <senko.rasic at collabora.co.uk>
    GabblePresence: pick resource based on (presence, last activity timestamp, priority) ordering

  Senko Rasic <senko.rasic at collabora.co.uk>
    test-gabble-presence.c: test for correct ordering of resources when picking for voip call

  Senko Rasic <senko.rasic at collabora.co.uk>
    presence.c: separate caps filtering and resource ordering more logically