Bug #47248 --> various problems with save as dialog from helper app. unload handler was calling cancel and we

weren't setting the action to saveToDisk in the right case

Landing branch changes to the tip.
r=alecf

xpfe/components/ucth/resources/helperAppLauncher.js

@@ -99,6 +99,7 @@ nsHelperAppLauncherDialog.prototype= {
             }
             this.appLauncher.launchWithApplication( this.chosenApp, dontAskNextTime );
         } else {
+            this.appLauncher.MIMEInfo.preferredAction = this.nsIHelperAppLauncher.saveToDisk;
             this.appLauncher.saveToDisk( null, dontAskNextTime );
         }
     

xpfe/components/ucth/resources/helperAppLauncher.xul

@@ -38,7 +38,6 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&caption.label;"
         onload="window.dialog = new nsHelperAppLauncherDialog()"
-        onunload="window.dialog.onCancel()"
         style="width: 40em;"
         class="dialog"
         align="vertical"