[Gossip-dev] merging TELEPATHY into HEAD

[Martyn Russell]

Xavier Claessens wrote:
> Hi,
> 
> Now that the GossipAccount rework is committed in HEAD I'm thinking
> about merging the TELEPATHY branch into HEAD. Here are my arguments:
> 
> 1) It's difficult to keep TELEPATHY in sync with HEAD, it takes time.
> 
> 2) The telepathy-specific code is under #ifdef USE_TELEPATHY so it
> shouldn't change anything if we don't compile with
> --enable-telepathy=yes
> 
> 3) When we have big rework (like the account one) we commit it into HEAD
> anyway...
> 
> 4) I think most of the work needed outside protocols/telepathy is now
> done.
> 
> 5) I already made a patch for HEAD to merge TELEPATHY into HEAD. I
> tested it with telepathy enabled and disabled and it seems to work
> pretty well in both cases. To test, just checkout HEAD and copy
> protocols/telepathy from TELEPATHY. Then apply this patch: 
> http://users.skynet.be/Zdra/gossip-merge.patch
> and add those files into src/
> http://users.skynet.be/Zdra/gossip-protocol-chooser.c
> http://users.skynet.be/Zdra/gossip-protocol-chooser.h
> 
> Note: With telepathy enabled only gabble works. If you try to connect a
> MSN account it crashes, I didn't looked yet to fix that.

Thanks Xavier, keeping me on my feet I see :)
This is my plan:

1. Let the current account rework sit in CVS for a week.

2. Release 0.18 next weekend.

3. Apply the TELEPATHY merge to HEAD and test it - if I am happy with
it, I will go ahead and commit it which will render the telepathy branch
no longer used.

4. Test test test for a few weeks to make sure we find no crashers.

5. Release 0.19 with TELEPATHY ability.

Hopefully the MSN transport will work by then.

-- 
Regards,
Martyn