[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Move unref of request pipeline after that of code that uses it, now that referencing thinko has been fixed

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    request-pipeline: correctly pass user_data to callbacks

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove unused gabble_request_pipeline_cache_quark

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add a regression test (which currently fails) for the vCard updating race (fd.o #11201)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Put vCard requests through the request pipeline, and fix fd.o#11201.

The bugfix is that we now coalesce multiple edits into one type="set" request,
and keep applying edits to subsequent type="set" requests until they finally
succeed or fail.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add a generic request pipeline (mostly written by Senko Rasic)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Get rid of useless variable when not debugging; it's not really any use when debugging either, so lose it completely

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    When freeing vCard cache entries, cancel their corresponding pipeline item, if any (it has a pointer to them)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Unref request pipeline earlier, so all requests are cancelled before the vCard manager is freed

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Now that the request pipeline works, pipeline up to 3 requests (that's how deep the vCard pipeline used to be)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    In gabble_g_hash_table_update, allow key_dup and value_dup to be NULL (meaning don't duplicate the pointer)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    request-pipeline: use DEBUG

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix vCard race regression test