[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tests/simple-conn.c: make the connect and disconnect process more realistic, by having them take half a second rather than occurring instantaneously

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpPresenceMixin: guarantee that get_contact_statuses is only called with a nonzero number of handles, and only if they're all valid