[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>
    Extend test-call-cancellation case (i) slightly, so there is one signal connection which will lose its weak ref before the pending call does, and one after

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tp_proxy_signal_connection_disconnect_dbus_glib: remove early return if sc->proxy == NULL (a relic of previous code), but make robust against iface_proxy already having gone away (=> idempotent)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix fd.o#14750 by delaying destruction of TpProxySignalConnection until we've had a chance to receive the weak-ref callback

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-call-cancellation: make some more variables static

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Relax assertion in test-disconnection: no longer require user data to have been freed immediately, but only after the main loop has run (likely to be necessary to fix #14750)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Amend regression test for #14750 to actually cause the crash.

It turns out that the problem is caused by:
* make a proxy, p, and an object, o, each with one ref
* make a function call with o as weak object
* connect to a signal with o as weak object
* unref p
* unref o

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add an attempt at a regression test for fd.o #14750, a crash in MC