http://git.collabora.co.uk/?p=user/cassidy/telepathy-salut;a=shortlog;h=refs/heads/file-uri-33833

That's basically the same implementation as in Gabble.

+  /* ContentHashType has to be first so we can easily skip it when needed */

Is this true in Salut?

In salut_file_transfer_channel_get_property:

+            self->priv->uri != NULL ? self->priv->uri: "");

you are missing a space here:                        ^^

Otherwise looks reasonable. I assume you did the constants change with Sed or something, so I didn't read every line of the diff. :)

(In reply to comment #2)
> +  /* ContentHashType has to be first so we can easily skip it when needed */
> 
> Is this true in Salut?

Oh good catch, it's not. I'm still thinking it's worth keeping Salut and
Gabble's code as close as possible, so I kept the ordering but updated the
comment.

> In salut_file_transfer_channel_get_property:
> 
> +            self->priv->uri != NULL ? self->priv->uri: "");
> 
> you are missing a space here:                        ^^

fixed.

Merged to master; will be in 0.5.0