[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>
    (trivia) Fix value of _extra_prop_impls_quark(): it's new in 0.7.9, not 0.7.3

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpDBusPropertiesMixin: implement a cleaner way for mixins to hook in property implementations

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add tp_dbus_properties_mixin_implement_interface to docs

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpDBusPropertiesMixin: rename _mixin_quark to _class_prop_impls_quark for greater clarity

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpDBusPropertiesMixin: rename _info_quark() to _iface_prop_info_quark() for greater clarity

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Minor documentation fix