bug 395140: leave preferred app as-is when the user sets the action for a type to something other than useHelperApp in Applications prefpane; r=gavin, a=mconnor

This commit is contained in:
myk@mozilla.org 2007-09-17 11:41:25 -07:00
parent 7888cc075a
commit c1b55b8a66

View File

@ -1320,15 +1320,13 @@ var gApplicationsPane = {
handlerInfo.disablePluginType(); handlerInfo.disablePluginType();
// Set the preferred application handler. // Set the preferred application handler.
// FIXME: consider leaving the existing preferred app in the list // We leave the existing preferred app in the list when we set
// when we set the preferred action to something other than useHelperApp // the preferred action to something other than useHelperApp so that
// so that legacy datastores that don't have the preferred app in the list // legacy datastores that don't have the preferred app in the list
// of possible apps still include the preferred app in the list of apps // of possible apps still include the preferred app in the list of apps
// the user can use to handle the type. Filed as bug 395140. // the user can choose to handle the type.
if (action == Ci.nsIHandlerInfo.useHelperApp) if (action == Ci.nsIHandlerInfo.useHelperApp)
handlerInfo.preferredApplicationHandler = actionItem.handlerApp; handlerInfo.preferredApplicationHandler = actionItem.handlerApp;
else
handlerInfo.preferredApplicationHandler = null;
// Set the "always ask" flag. // Set the "always ask" flag.
handlerInfo.alwaysAskBeforeHandling = false; handlerInfo.alwaysAskBeforeHandling = false;