[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    After returning an error from gabble_connection_get_capabilities, don't happily carry on regardless (fd.o #15198)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    When adding ourselves to the local-pending set for an incoming call, make the actor the handle of the caller (fd.o #14806)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add regression test for fd.o #15198