[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Refactor TpProxyPendingCall to avoid revenge-of-#14750.
Also don't crash if the order of _completed and _idle_invoke gets reversed by a hypothetical dbus-glib behaviour change.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Relax assertions about how quickly user data gets freed when cancelling pending calls: we probably can't free it synchronously and still fix revenge-of-#14750

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add yet another failing test case: the equivalent of fd.o #14750, but for pending calls rather than signals

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add yet another test case for call cancellation: this time (case J) the call is cancelled, which causes destruction of the weakly referenced object, which currently causes a crash

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Now that I've understood fd.o#14750 better, add a properly minimal test case

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Annotate contents of TpProxyPendingCall a bit more