[Telepathy] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv-misc-2

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    text-mixin.h: Remove tp_text_mixin_get_type, there's no such function

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Change misleading constant name LAST_GABBLE_PRESENCE to NUM_GABBLE_PRESENCES