572454 - Clean up SeaMonkey versions of getFileDisplayName

Status: RESOLVED FIXED

(SeaMonkey :: Preferences, defect)

Description

[Robert Kaiser]

Bug 569542 has browser/ parts that should be ported to SeaMonkey. Should be easy to do!

Comment 1

[:Gavin Sharp [email: [e-mail]]]

The only changes from that bug that applies to SeaMonkey are just cleanup - your suite/feeds/src/FeedWriter.js and suite/common/pref/pref-applications.js contain copies of those methods, so making them consistent with all the others (including the name) makes sense, but they're not buggy.

(Ideally we'd fix this by avoiding the duplication entirely, but there's no real good common place to put this small amount of code...)

Comment 2

[Robert Kaiser]

Attachment: match the Firefox patch

This patch matches the Firefox version, I guess that's all that needs to be done here.

Comment 3

[Ian Neal]

Comment on attachment 456694 [details] [diff] [review]
match the Firefox patch

>-function getDisplayNameForFile(aFile) {
>+function getFileDisplayName(file) {
I'd prefer we kept aFile as the argument, unless there is a particular reason to make that change.
r=me with that addressed.

Comment 4

[Robert Kaiser]

Pushed as http://hg.mozilla.org/comm-central/rev/d4d7f0a8fe16 with the param reverted to aFile.

Comment 5

[[e-mail]]

Comment on attachment 456694 [details] [diff] [review]
match the Firefox patch

>diff --git a/suite/common/pref/pref-applications.js b/suite/common/pref/pref-applications.js
>+  return file.leafName;
...
>diff --git a/suite/feeds/src/FeedWriter.js b/suite/feeds/src/FeedWriter.js
>+    return file.fileName;
Oops; This should have been leafName too.

Comment 6

[Robert Kaiser]

(In reply to comment #5)
> >diff --git a/suite/feeds/src/FeedWriter.js b/suite/feeds/src/FeedWriter.js
> >+    return file.fileName;
> Oops; This should have been leafName too.

Gah, that's a mis-port, apparently, Firefox has is correct. Bad boy me for messing this one up. :(

Will land fixup shortly with rs=Neil over IRC.

Comment 7

[Robert Kaiser]

Landed this followup as http://hg.mozilla.org/comm-central/rev/d817de56d8a1