[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Correct sense of check in tp_proxy_constructor so must_have_unique_name works as intended

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpProxy: allow either dbus-daemon or dbus-connection or both to be set at construct time; if both are set, assert that the dbus-daemon's dbus-connection is the same as ours