From 513fe5a35e73957bd84f7a9cb4feba950bafacf7 Mon Sep 17 00:00:00 2001 From: "ben%netscape.com" Date: Wed, 17 May 2006 02:27:07 +0000 Subject: [PATCH] fix for 45687, fix hang when editing mime type --- suite/common/pref/pref-applications-edit.xul | 17 +++++------------ suite/common/pref/pref-navigator.xul | 4 ++-- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/suite/common/pref/pref-applications-edit.xul b/suite/common/pref/pref-applications-edit.xul index ed5d42d297f1..b2ba9c7f2688 100644 --- a/suite/common/pref/pref-applications-edit.xul +++ b/suite/common/pref/pref-applications-edit.xul @@ -54,7 +54,6 @@ function Startup() { - dump("*** noopy\n"); doSetOKCancel(onOK); gIcon = document.getElementById("largeIcon"); @@ -65,17 +64,14 @@ gAppPath = document.getElementById("appPath"); gAskBeforeOpen = document.getElementById("askBeforeOpen"); - dump("*** noopy\n"); gBundle = srGetStrBundle("chrome://communicator/locale/pref/pref-applications.properties"); - dump("*** noopy\n"); var handlerInfo = window.arguments[0]; gExtensionLabel.setAttribute("value", handlerInfo.extensions); gMIMEField.value = handlerInfo.mimeType; gOldMIME = handlerInfo.mimeType; - dump("*** noopy\n"); // figure out how this type is handled var data = 0; if (handlerInfo.handleInternal == "true") @@ -85,7 +81,6 @@ else data = 2; - dump("*** noopy\n"); gHandlerGroup.selectedItem = gHandlerGroup.getElementsByAttribute("data", data)[0]; doEnabling(); @@ -97,7 +92,6 @@ gContentType.setAttribute("value", handlerInfo.description); gIcon.setAttribute("src", handlerInfo.largeIconURL); - dump("*** noopy\n"); gMIMEField.focus(); } @@ -119,7 +113,6 @@ var windowTitle = gBundle.GetStringFromName("chooseHandler"); var programsFilter = gBundle.GetStringFromName("programsFilter"); filePicker.init(window, windowTitle, FP.modeOpen); - dump("*** navigator.platform = " + navigator.platform + "\n"); if (navigator.platform == "Windows") filePicker.appendFilter(programsFilter, "*.exe; *.com"); else @@ -220,7 +213,7 @@ - + @@ -230,18 +223,18 @@ - + - + - + - + diff --git a/suite/common/pref/pref-navigator.xul b/suite/common/pref/pref-navigator.xul index 126f13ab134f..012bbc396f40 100644 --- a/suite/common/pref/pref-navigator.xul +++ b/suite/common/pref/pref-navigator.xul @@ -48,7 +48,7 @@ - <text value="&navRadio;"/> + <radiogroup id="startupPage" autostretch="never" orient="vertical" pref="true" preftype="int" prefstring="browser.startup.page" @@ -62,7 +62,7 @@ <!-- homepage specification --> <titledbox orient="vertical"> - <title><text value="&header2.label;"/> + <html>&homePageIntro.label;</html> <box autostretch="never"> <text class="label" value="&location.label;" accesskey="&location.accesskey;" for="browserStartupHomepage"/>