[Telepathy-commits] merge: stream-engine

[Merge Monkey]

Merge to:

  stream-engine

From:

  stream-engine-daf

Changes:

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    channel.c: dispose: move proxy pointer aside before unreffing

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    session.c: disconnect destroy_cb before unreffing session proxy

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    channel_destroyed(): do nothing if priv->channel_proxy is NULL; move proxy pointer aside before unreffing it