379647 - Remove 4.x ldap address book migration from the trunk

Status: RESOLVED FIXED

(MailNews Core :: Address Book, defect)

Description

[Mark Banner (:standard8)]

In a similar vain to bug 379068, I'd like to remove the ab migration for 4.x books from the trunk - with SeaMonkey getting a new profile migrator soon (and location) any migration for the 4.x address books should be done outside the ab code. Besides which we can't actually migrate personal books, just ldap ones, so we're not loosing much functionality.

This will also allow much easier clean up of the address book code base.

Comment 1

[Mark Banner (:standard8)]

Attachment: Part 1 - Remove ldap prefs service migration

This removes the migration function from the ldap prefs service. It used to take the 4.x LDAP prefs and change them into the current format - we don't need this now.

Note that currently the prefs service is still required for pref-directory.js but I'm planning to kill it completely in a follow-up bug.

There's some more work to do in nsDirPrefs.cpp after this but this is a good first step.

Comment 2

[David :Bienvenu]

Comment on attachment 263656 [details] [diff] [review]
Part 1 - Remove ldap prefs service migration

Except, I'm not sure you can remove the rename stuff - doesn't it still get called? e.g.:

http://mxr.mozilla.org/mailnews/source/mailnews/addrbook/resources/content/abCommon.js#298

Comment 3

[Mark Banner (:standard8)]

(In reply to comment #2)
> (From update of attachment 263656 [details] [diff] [review])
> Except, I'm not sure you can remove the rename stuff - doesn't it still get
> called? e.g.:
> 
Yes it does - sorry that's a different patch I'm working on. I also realised totally forgot about /mail :-( I'll do a new patch later.

Comment 4

[Mark Banner (:standard8)]

Attachment: Part 1 - Remove ldap prefs service migration v2 (checked in)

This patch should have everything right this time.

Comment 5

[Mark Banner (:standard8)]

Attachment: Remove 4.x specific prefs from nsDirPrefs

The prefs with nsDirPrefs that I'm removing with this patch were either used by the ldap prefs service in 4.x ldap address book, or just 4.x things that we never used.

It also removes the copying from the ldap_1 to the ldap_2 prefs that was part of the 4.x migration and therefore does quite a bit of tidy up. I'm also dropping the defined prefs that were to do with those migration routines. I don't see a problem with those but hopefully getting it on trunk will bring up any issues.

The makefile change is to fix a problem with getting the default uri of the address book - a previous change I'd done in theory made the ldap case worse, but I think its hidden as we normally get the uri from places other than via nsDirPrefs now. I just realised about it whilst I was checking which headers still needed to be included.

Comment 6

[Mark Banner (:standard8)]

Comment on attachment 263915 [details] [diff] [review]
Remove 4.x specific prefs from nsDirPrefs

Err, wrong patch attached :-(

Comment 7

[Mark Banner (:standard8)]

Attachment: Remove 4.x specific prefs from nsDirPrefs

Ok, got the right one this time.

Comment 8

[David :Bienvenu]

Comment on attachment 263916 [details] [diff] [review]
Remove 4.x specific prefs from nsDirPrefs

great, thx, Mark

Comment 9

[Mark Banner (:standard8)]

Patch checked in, this bug is now fixed.