From a33fe8e6d4cea3781015cd1f09f8350bf4212058 Mon Sep 17 00:00:00 2001
From: "myk%mozilla.org" <myk%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 30 Sep 2007 20:12:51 +0000
Subject: [PATCH] bug 397690: followup patch for complete fix to make handler
 apps display as full application name rather than executable name; r=gavin,
 a=mconnor

git-svn-id: svn://10.0.0.236/trunk@236957 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/components/preferences/applications.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mozilla/browser/components/preferences/applications.js b/mozilla/browser/components/preferences/applications.js
index 39c70ac4703..a669cdfbd63 100755
--- a/mozilla/browser/components/preferences/applications.js
+++ b/mozilla/browser/components/preferences/applications.js
@@ -1005,7 +1005,11 @@ var gApplicationsPane = {
         return this._prefsBundle.getString("saveFile");
 
       case Ci.nsIHandlerInfo.useHelperApp:
-        return getDisplayNameForFile(aHandlerInfo.preferredApplicationHandler.executable);
+        var preferredApp = aHandlerInfo.preferredApplicationHandler;
+        if (preferredApp instanceof Ci.nsILocalHandlerApp)
+          return getDisplayNameForFile(preferredApp.executable);
+        else
+          return preferredApp.name;
 
       case Ci.nsIHandlerInfo.handleInternally:
         // For the feed type, handleInternally means live bookmarks.