[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Disable some of the more verbose debug messages in TpProxy, but leave them possible to enable at compile time

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpProxy: delay signal handler invocation to avoid re-entering libdbus

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Revert a patch which wasn't meant to be in this branch

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Re-order helper functions in TpProxy so they actually work

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpProxy: delay emitting 'destroyed' so it only goes out after all idle callback invocations have gone off (and also, so the destroyed callback is invoked with dbus_connection_dispatch not on the stack)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpProxy: redo signal connection API so signal callbacks can be invoked in idle callbacks (same reasoning as method callbacks)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove some internal DEBUG() from proxy.c

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    In TpProxyPendingCall, call user-supplied callback in an idle handler for reentrancy

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Alter pending call API so it can call the callback from an idle handler, to avoid problems with dbus_connection_dispatch non-reentrancy

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Allow callback for pending calls to be NULL, but not invoke_callback (which is the one we actually call directly)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Refactor TpProxy signal invocation in preparation for queueing signal callbacks for an idle handler; ref the TpProxy while calling the callback, to avoid the callback dying halfway through the callback