Merge to: telepathy-gabble From: /home/smcv/public_html/darcs/gabble-smcv Changes: Simon McVittie <simon.mcvittie at collabora.co.uk> Don't use a TP_ prefix on our type #defines, to avoid errors when they're added to telepathy-glib