[Telepathy-commits] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

  /home/ptlo/public_html/darcs/tp-sofiasip-senko

Changes:

  Senko Rasic <senko.rasic at collabora.co.uk>
    SipConnection: NUA stack can be NULL at disconnect, if we aborted connecting before it was created

  Senko Rasic <senko.rasic at collabora.co.uk>
    SipConnection: don't overwrite error from tp_handle_ensure

  Senko Rasic <senko.rasic at collabora.co.uk>
    SIPConnection: call nua_shutdown only if neccessary, otherwise manually clean up sofia adapter