325958 - Misc Address Book tidying up

Status: RESOLVED FIXED

(MailNews Core :: Address Book, defect)

Description

[Mark Banner (:standard8)]

There are some unused variables/functions and some unneeded includes that I'd like to clean up and remove from address book but don't really fit in any other bug at the moment. So this bug is for them.

Comment 1

[Mark Banner (:standard8)]

Attachment: idl tidy and a removal of function and unused variable

This patch is mainly aimed at cleaning up the #includes a bit (there are some redundant ones/some changed ones - changed = #include -> interface). There is also the removal of a redundant function and a redundant variable from elsewhere.

Comment 2

[Mark Banner (:standard8)]

Attachment: Remove pref-addressingOverlay.xul (checked in, trunk + branch)

According to lxr (http://lxr.mozilla.org/seamonkey/search?string=pref-addressbookOverlay.xul) pref-addressbookOverlay is only mentioned in the jar.mn file. I've done some other searching around and can't see where it would get hooked in by other means. The only thing I can think of is that it was from a time when address book may have almost become a seperate section in prefs. Therefore I guess its safe for us to remove it.

Comment 3

[[e-mail]]

Comment on attachment 210790 [details] [diff] [review]
Remove pref-addressingOverlay.xul (checked in, trunk + branch)

Yeah, it looks as if mailPrefsOverlay.xul covers this.

Comment 4

[Mark Banner (:standard8)]

Attachment: Fixes small leak in nsAbBSDirectory.cpp (checked in, trunk + branch)

Fixes a small leak when we're modifying a directory.

Comment 5

[Mark Banner (:standard8)]

Comment on attachment 212227 [details] [diff] [review]
Fixes small leak in nsAbBSDirectory.cpp (checked in, trunk + branch)

Requesting branch approval for this small memory leak fix patch. Should be low risk.

Comment 6

[Mark Banner (:standard8)]

Comment on attachment 210790 [details] [diff] [review]
Remove pref-addressingOverlay.xul (checked in, trunk + branch)

Requesting branch approval, Removes a redundant file that's no longer needed.

Comment 7

[Mark Banner (:standard8)]

Comment on attachment 210757 [details] [diff] [review]
idl tidy and a removal of function and unused variable

One of my other patches will probably break this one, I'll re-evaluate if I want to do all parts of this after that one has gone in.

Comment 8

[Mark Banner (:standard8)]

Attachment: Random tidy ups.

Some more random tidy up and improvements in the code.

Comment 9

[David :Bienvenu]

Comment on attachment 214595 [details] [diff] [review]
Random tidy ups.

a few nits:

saw this in a couple places:

-    if (!value)
+    if (mName.IsEmpty())
         *aName = 0;
     else
         *aName = ToNewCString(mName);

can just be
*aName = (mName.IsEmpty() ? 0 : ToNewCString(mName);

+      *matchFound = (conditionType == nsIAbBooleanConditionTypes::Exists) ?
+          PR_TRUE : PR_FALSE;

can just be *matchFound = (conditionType == nsIAb...);

-    if (!DIR_GetDirectories())
+    nsVoidArray *directories = DIR_GetDirectories();
+    if (!directories)
       return NS_ERROR_FAILURE;

I hate dropping errors like this, but I guess DIR_GetDirectories is going away eventually anyway.

sr=bienvenu with those nits addressed.

Comment 10

[Mark Banner (:standard8)]

Attachment: Random tidy ups (checked in, trunk + branch)

The patch I checked in after having addressed bienvenu's comments. Requesting approval for 1.8.1 branch to keep code in sync and enable the codesize to be reduced and improved a little - with removal of redundant variables and assigns  etc.

Comment 11

[Mark Banner (:standard8)]

Ok, I think I've covered most of what I wanted to do initially at least. Any more changes can be covered under other bugs. Marking this as fixed.