diff --git a/mozilla/browser/components/preferences/applications.js b/mozilla/browser/components/preferences/applications.js index 8a7ac6c9074..39c70ac4703 100755 --- a/mozilla/browser/components/preferences/applications.js +++ b/mozilla/browser/components/preferences/applications.js @@ -1005,7 +1005,7 @@ var gApplicationsPane = { return this._prefsBundle.getString("saveFile"); case Ci.nsIHandlerInfo.useHelperApp: - return aHandlerInfo.preferredApplicationHandler.name; + return getDisplayNameForFile(aHandlerInfo.preferredApplicationHandler.executable); case Ci.nsIHandlerInfo.handleInternally: // For the feed type, handleInternally means live bookmarks. @@ -1065,7 +1065,7 @@ var gApplicationsPane = { isValidHandlerApp: function(aHandlerApp) { if (!aHandlerApp) return false; - + if (aHandlerApp instanceof Ci.nsILocalHandlerApp) return aHandlerApp.executable && aHandlerApp.executable.exists() && @@ -1150,7 +1150,10 @@ var gApplicationsPane = { let menuItem = document.createElementNS(kXULNS, "menuitem"); menuItem.setAttribute("action", Ci.nsIHandlerInfo.useHelperApp); - menuItem.setAttribute("label", possibleApp.name); + if (possibleApp instanceof Ci.nsILocalHandlerApp) + menuItem.setAttribute("label", getDisplayNameForFile(possibleApp.executable)); + else + menuItem.setAttribute("label", possibleApp.name); menuItem.setAttribute("image", this._getIconURLForHandlerApp(possibleApp)); // Attach the handler app object to the menu item so we can use it