GNOME Bugzilla – Bug 612555
Remove butterfly workarounds
Last modified: 2011-09-26 10:28:10 UTC
Empathy contains workarounds for butterfly's old way of doing 1-1 text chats. For now, there is code to work with both old and new versions of butterfly. We should remove these workarounds when we've decided we don't care about old butterfly anymore. 1. in empathy-tp-chat.c, it sets the remote-contact from the other participant of the MUC. 2. empathy-chat-window.c contains something else about MSN group chats. There could easily be more. See bug #612461 for some more details.
In bug #612519, I added a migration path for logs from old butterfly to new butterfly (due to the removal of network ID from contact identifiers). We should remove that too, when we no longer care about old butterfly.
It would be good to make these changes in 2.31.x. Jonny: any chance you could cook a branch?
That will be for 3.0, I don't want to risk regressions at this point.
I removed the butterfly migration tool : http://git.Collabora.co.uk/?p=user/cassidy/empathy;a=shortlog;h=refs/heads/butterfly-migration
This patch has been "included" in http://git.collabora.co.uk/?p=user/jonny/empathy.git;a=shortlog;h=refs/heads/butterfly Looks good assuming you tested group chats with a recent butterfly. We'll merge it once 2.30 will be branched.
Created attachment 197254 [details] [review] all: remove butterfly workarounds (bgo#612555) Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Created attachment 197255 [details] [review] remove butterfly-logs-migrated gsettings key
Why am I constantly failing to merge this? I rebased the branch on top of master and will attach patches so, hopefully, I will actually merge it this time.
Attachment 197255 [details] pushed as 3a459b3 - remove butterfly-logs-migrated gsettings key Merged to master.