[Telepathy-commits] merge: stream-engine

[Merge Monkey]

Merge to:

  stream-engine

From:

  stream-engine-daf

Changes:

  dafydd.harries at collabora.co.uk
    fix inadvertently inverted condition

  dafydd.harries at collabora.co.uk
    shutdown_channel (): remove unused second argument

  dafydd.harries at collabora.co.uk
    channel.c: use nullness of channel proxy to decide whether to try and disconnect signals

  dafydd.harries at collabora.co.uk
    make disconnecting channel's destroy signal handler idempotent

  dafydd.harries at collabora.co.uk
    channel.c: nullify reference to channel proxy when it's destroyed

  dafydd.harries at collabora.co.uk
    only unhook destroy handler if the channel proxy is not null