Merge lp://qastaging/~igors/do-plugins/Thunderbird-fix into lp://qastaging/do-plugins

Proposed by Igor Slepchin
Status: Merged
Merged at revision: 757
Proposed branch: lp://qastaging/~igors/do-plugins/Thunderbird-fix
Merge into: lp://qastaging/do-plugins
Diff against target: 367 lines (+213/-44)
3 files modified
Thunderbird/Makefile.am (+2/-1)
Thunderbird/Thunderbird.mdp (+1/-0)
Thunderbird/src/ThunderbirdContactItemSource.cs (+210/-43)
To merge this branch: bzr merge lp://qastaging/~igors/do-plugins/Thunderbird-fix
Reviewer Review Type Date Requested Status
Chris Halse Rogers Needs Information
Review via email: mp+17102@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Igor Slepchin (igors) wrote :

This fixes Thunderbird plugin. The original problem was described in https://bugs.launchpad.net/do-plugins/+bug/305778 and was fixed by the first commit on the branch.

The rest of the changes add the following:

 * Support for multiple Thunderbird emails on a single ContactItem (ContactDetailItems are introduced)
 * Importing emails from Thunderbird history in addition to Thunderbird address book
 * Using the most used email for main ContactItem (as determined by Thunderbird's PopularityIndex)

I know the plugin is marked as "Community" but people still seem to distribute it (e.g., Fedora does).

Revision history for this message
Chris Halse Rogers (raof) wrote :

Bah. Sometimes, I hate bzr.

This branch looks like it's got some valuable improvements, but I can't actually pull it because of a repository version mismatch! If you could hit the “upgrade” button on your branch, it should convert it to a 2a repository, which I'll be able to pull.

It looks good, with the exception of the EmailList class. I'm not sure why you don't just pass a Dictionary<string, uint> around directly? The only value of EmailList appears to be .Add, which is only called once, and looks like it could replace with TryGetValue?

review: Needs Information
Revision history for this message
Igor Slepchin (igors) wrote :

Hey Chris - I clicked "upgrade" half a dozen times now but I'm not sure it's changed anything (upgrade button is still available and the repo is still marked as RepositoryFormatKnitPack6RichRoot (bzr 1.9)). Please let me know if this still does not work for you and I'll try to do the merge to the trunk locally or just re-publish it as a new branch (I still have the branch sources that I seem to be able to work with).

As for EmailList class, the primary motivation for it was overwriting Add method so that I didn't have to check if the key was already present in the Dictionary whenever I needed to update "popularity" value.

Revision history for this message
Chris Halse Rogers (raof) wrote :

Bah. No, it hasn't upgraded, so I'm still unable to pull from it.

Running “bzr upgrade --2a lp:~igors/do-plugins/Thunderbird-fix” might upgrade it properly, or you could (hopefully) push a new branch.

Ah. Somehow I didn't notice all the .Adds when doing my cursory review. I still find the class a bit of a heavyweight solution, so I might play around with some other options. I don't expect you to need to do any work there, though.

Revision history for this message
Igor Slepchin (igors) wrote :

bzr upgrade apparently worked, thanks!

I also merged this to the current trunk and re-pushed to https://code.launchpad.net/~igors/do-plugins/Thunderbird-fix-redux just in case so please let me know if either of these works for you.

Revision history for this message
Chris Halse Rogers (raof) wrote :

Excellent. That works.

I'll perform a more thorough review and merge.

687. By Igor

Strip leading/trailing spaces and quotes from display names so that
multiple Thunderbird contacts get merged better.

Revision history for this message
Igor Slepchin (igors) wrote :

While I have your attention: do you think you could commit the fix for bug 698078 while at it? Thunderbird plugin is fairly useless if the email action itself does not work :p

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches