[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>
    roster: ref handles when they are put in a GroupMembershipUpdate (hopefully fixes fd.o #12791)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    _gabble_roster_item_update: eliminate unnecessary temporary, old_groups

old_groups is slightly misleadingly named - it's a direct pointer to the intset
underlying item->groups, so its contents change whenever item->groups does.
(In practice we only used it once, before making any changes.)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    roster/groups test: include amy's <item> in the roster twice, removing a group the second time (this causes the same crash as fd.o #12791, although it doesn't seem very likely to be the real cause)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add a comment to ./tests/twisted/roster/groups.py explaining how fragile it is

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    roster: misc stylistic fixes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    ./tests/twisted/roster/groups.py: revert addition of #12791 regression test

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add fd.o #12791 regression test back as a separate file

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    roster: Annotate GroupsUpdateContext, GroupMembershipUpdate with ownership

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    roster/groups test: if assertions fail, print more useful info

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add a regression test for roster groups

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Amend #12791 regression test to test with what the submitter actually had on their roster, as well as with a garbled roster that the server shouldn't have sent us

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    roster: amend comments for GroupMembershipUpdate/GroupsUpdateContext to indicate where things are borrowed from

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Skip roster <item>s that contain '/' (fd.o #12791)