[Telepathy] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

  /home/smcv/public_html/darcs/tp-sofiasip-057-compat

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't use LAST_TP_HANDLE_TYPE, use NUM_TP_HANDLE_TYPES instead (telepathy-glib 0.5.7 removes the former)