(In reply to comment #0)
> http://cgit.collabora.com/git/user/cassidy/telepathy-idle/log/?h=next
> 
> I split the commits to make reviewing easier but we may want to merge it as
> a big single commit as "make check" only passes with the top one.

To be honest, bisecting is doomed in this situation. I'd be inclined to leave them split.

> constants: port to Telepathy 1.0

Any chance you could sync from <https://bugs.freedesktop.org/show_bug.cgi?id=69618#c4> first? It'd be a clearer diff afterwards, I think.

All the other commits look fine, but I'd like some of them in master so merges are less horrible:

> add missing telepathy-glib-dbus.h includes

This could go to master, with a comment noting that they're not all needed yet, but will be needed in Telepathy 1.0.

> extensions: include telepathy-glib.h in generated code

via master, please

> TpBaseConnectionClass->create_channel_factories has been removed

Could be done on master, with a comment about future-proofing

> s/NUM_TP_*/TP_NUM_*

master

> 	use GetContactByID instead of RequestHandles

master

> 	stop using RequestHandles when joining channels

master

> stop using GetInterfaces()

master

> NewChannel signal has been removed

could go via master with a different commit message

> stop using GetSelfHandle()

master

> stop using InspectHandles()

master

> room-list-channels: use CHANNEL_TYPE_ROOM_LIST

master

(In reply to comment #1)
> Any chance you could sync from
> <https://bugs.freedesktop.org/show_bug.cgi?id=69618#c4> first? It'd be a
> clearer diff afterwards, I think.

Sure. Can you please push the branch so I can easily steal the new file.

> All the other commits look fine, but I'd like some of them in master so
> merges are less horrible:

Ok, I'll do some rebasing.

http://cgit.collabora.com/git/user/cassidy/telepathy-idle/log/?h=next rebased on top of master and updated.

Ship it!

Pushed to a 'next' branch. thanks for the reviews.