As with the ongoing effort, dropping nsISupportsArray from here tidies the code a bit and will introduce some additional type safety.

Updated patch to fix bitrot.

Comment on attachment 321037 [details] [diff] [review] The fix v2 One nit: This comment is now wrong, and you could just use NS_ENSURE_ARG_POINTER. // can't have both be null, but one null is OK, since the caller // may just be trying to count the number of unverified folders. - if (!aFoldersArray && !aNumUnverifiedFolders) + if (!aNumUnverifiedFolders) return NS_ERROR_NULL_POINTER;

After looking at David's comments and doing a bit more investigation, I realised that GetUnverifiedFolders is only called once (and isn't an interface defined function) and the count is actually unnecessary because it always wants the folder array - hence just use the count from the nsCOMArray. So I've reworked GetUnverifiedFolders and GetUnverifiedSubFolders to not do the count and not return anything - the array just gets passed in as a reference and modified appropriately.

Comment on attachment 321305 [details] [diff] [review] The fix v3 (diff -w) thx, Mark.

Patch checked in -> fixed.