diff --git a/suite/browser/jar.mn b/suite/browser/jar.mn index b31a907566c..9828039ec0f 100644 --- a/suite/browser/jar.mn +++ b/suite/browser/jar.mn @@ -24,7 +24,6 @@ comm.jar: content/navigator/searchconfig.properties content/navigator/sessionHistoryUI.js content/navigator/tabbrowser.xml - content/navigator/turboDialog.xul content/navigator/urlbarBindings.xml content/navigator/viewsource.js content/navigator/viewSource.xul diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js index 98b4cb55d82..b3b09fc011a 100644 --- a/suite/browser/navigator.js +++ b/suite/browser/navigator.js @@ -581,7 +581,6 @@ function Startup() contentArea.addEventListener("pageshow", pageShowEventHandlers, true); contentArea.addEventListener("focus", contentAreaFrameFocus, true); - var turboMode = false; // set default character set if provided if ("arguments" in window && window.arguments.length > 1 && window.arguments[1]) { if (window.arguments[1].indexOf("charset=") != -1) { @@ -590,8 +589,6 @@ function Startup() //we should "inherit" the charset menu setting in a new window getMarkupDocumentViewer().defaultCharacterSet = arrayArgComponents[1]; } - } else if (window.arguments[1].indexOf("turbo=yes") != -1) { - turboMode = true; } } @@ -663,17 +660,6 @@ function Startup() } } - // Close the window now, if it's for turbo mode startup. - if ( turboMode ) { - // Set "command line used" flag. If we don't do this, then when a cmd line url - // for a "real* invocation comes in, we will override it with the "cmd line url" - // from the turbo-mode process (i.e., the home page). - appCore.cmdLineURLUsed = true; - // For some reason, window.close() directly doesn't work, so do it in the future. - window.setTimeout( "window.close()", 100 ); - return; - } - // Focus the content area unless we're loading a blank page, or if // we weren't passed any arguments. This "breaks" the // javascript:window.open(); case where we don't get any arguments diff --git a/suite/browser/turboDialog.xul b/suite/browser/turboDialog.xul deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/suite/common/pref/pref-advanced.xul b/suite/common/pref/pref-advanced.xul index 8732b872681..821e6cfd72a 100644 --- a/suite/common/pref/pref-advanced.xul +++ b/suite/common/pref/pref-advanced.xul @@ -55,93 +55,10 @@ var _elementIDs = ["advancedJavaAllow", "systemPrefCheck"]; function Startup() { - turboCheck(); sysPrefCheck(); initJVMConfigList(); } - /* - * Name: turboCheck() - * - * Arguments: none - * - * Description: This function is called when the root advanced prefs panel - * is loaded. The turbo mode setting is not exactly a preference -- setting - * the checkbox should (on leaving the prefs with an "Ok") result in a call - * to the backend to do the necessary win32 registry twiddling needed for - * turbo mode to go into effect. Clearing it should undo this work. We need - * to call the backend to determine if turbo mode is enabled (since we are - * required to check for it in a non-trivial way) and then explicitly set the - * checkbox here based on what we find. Finally, we have to hide the checkbox - * (and the group box that frames it) if we are not executing on a Win32 - * platform. - * - * Return Value: void - * - * Original Code: syd@netscape.com 6/8/2001 - * - */ - - function turboCheck() - { - var frame = document.getElementById("perfSettings"); - if (navigator.platform != "Win32") { - frame.hidden = true; - return; - } - if (!("isTurboEnabled" in parent)) - parent.isTurboEnabled = -1; - else { - document.getElementById("enableTurbo").checked = parent.isTurboEnabled; - return; - } - var winhooksService = Components.classes["@mozilla.org/winhooks;1"].getService(Components.interfaces.nsIWindowsHooks); - if (winhooksService) { - parent.isTurboEnabled = winhooksService.isOptionEnabled("-turbo"); - document.getElementById("enableTurbo").checked = parent.isTurboEnabled; - } - - parent.hPrefWindow.registerOKCallbackFunc( saveTurboSetting ); - } - - /* - * Name: saveTurboSetting() - * - * Arguments: none - * - * Description: This function is called when the user hits the OK button in - * the preferences panel. The function determines what the turbo "preference" - * setting is and performs the appropriate action to enable or disable turbo mode. - * - * Return Value: void - * - * Original Code: syd@netscape.com 6/9/2001 - * - */ - - function saveTurboSetting() { - if (navigator.platform != "Win32") - return; - - var winhooksService = Components.classes["@mozilla.org/winhooks;1"].getService(Components.interfaces.nsIWindowsHooks); - if (winhooksService && parent.isTurboEnabled != -1) { - if (parent.isTurboEnabled) - winhooksService.startupAddOption("-turbo"); - else - winhooksService.startupRemoveOption("-turbo"); - var appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"]. - getService(Components.interfaces.nsIAppStartup); - var nativeAppSupport = null; - try { - nativeAppSupport = appStartup.nativeAppSupport; - } - catch ( ex ) { - } - if (nativeAppSupport) - nativeAppSupport.isServerMode = parent.isTurboEnabled; - } - } - function sysPrefCheck() { var frame = document.getElementById("systemPrefs"); if ("@mozilla.org/system-preference-service;1" in Components.classes) @@ -352,17 +269,6 @@ - - - - - - &prefTurbo.desc; - - - diff --git a/suite/locales/en-US/chrome/browser/turboDialog.dtd b/suite/locales/en-US/chrome/browser/turboDialog.dtd deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/suite/locales/en-US/chrome/browser/turboMenu.properties b/suite/locales/en-US/chrome/browser/turboMenu.properties deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd b/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd index ae0d4e71e64..4c38ae70ff7 100644 --- a/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd +++ b/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd @@ -7,12 +7,6 @@ - - - - - - diff --git a/suite/locales/en-US/chrome/mailnews/mailTurboMenu.properties b/suite/locales/en-US/chrome/mailnews/mailTurboMenu.properties deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/suite/locales/jar.mn b/suite/locales/jar.mn index 71eb950c43f..e395bff89cd 100644 --- a/suite/locales/jar.mn +++ b/suite/locales/jar.mn @@ -236,7 +236,6 @@ locale/@AB_CD@/messenger/mailOverlay.dtd (%chrome/mailnews/mailOverlay.dtd) locale/@AB_CD@/messenger/mailPrefsOverlay.dtd (%chrome/mailnews/pref/mailPrefsOverlay.dtd) locale/@AB_CD@/messenger/mailTasksOverlay.dtd (%chrome/mailnews/mailTasksOverlay.dtd) - locale/@AB_CD@/messenger/mailTurboMenu.properties (%chrome/mailnews/mailTurboMenu.properties) locale/@AB_CD@/messenger/mailViewList.dtd (%chrome/mailnews/mailViewList.dtd) locale/@AB_CD@/messenger/mailViewSetup.dtd (%chrome/mailnews/mailViewSetup.dtd) locale/@AB_CD@/messenger/mailviews.properties (%chrome/mailnews/mailviews.properties) @@ -320,8 +319,6 @@ locale/@AB_CD@/navigator/pageInfo.properties (%chrome/browser/pageInfo.properties) locale/@AB_CD@/navigator/tabbrowser.dtd (%chrome/browser/tabbrowser.dtd) locale/@AB_CD@/navigator/tabbrowser.properties (%chrome/browser/tabbrowser.properties) - locale/@AB_CD@/navigator/turboDialog.dtd (%chrome/browser/turboDialog.dtd) - locale/@AB_CD@/navigator/turboMenu.properties (%chrome/browser/turboMenu.properties) locale/@AB_CD@/navigator/viewSource.dtd (%chrome/browser/viewSource.dtd) locale/@AB_CD@/navigator/viewSource.properties (%chrome/browser/viewSource.properties) locale/@AB_CD@/navigator-platform/mac/navigator.properties (%chrome/browser/mac/navigator.properties) diff --git a/suite/themes/classic/communicator/dialogs.css b/suite/themes/classic/communicator/dialogs.css index 79f9d9ce2a5..256184e07f5 100644 --- a/suite/themes/classic/communicator/dialogs.css +++ b/suite/themes/classic/communicator/dialogs.css @@ -42,10 +42,3 @@ @import url("chrome://communicator/skin/"); @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -/* ::::: turbo confirmation dialog ::::: */ - -#turboTrayImage { - list-style-image: url("chrome://communicator/skin/icons/turbo-systray.gif"); - border: 2px inset ThreeDFace !important; -} diff --git a/suite/themes/classic/jar.mn b/suite/themes/classic/jar.mn index f761d2ddfd8..3475d0818c3 100644 --- a/suite/themes/classic/jar.mn +++ b/suite/themes/classic/jar.mn @@ -64,7 +64,6 @@ classic.jar: skin/classic/communicator/icons/lock-broken.png (communicator/icons/lock-broken.png) skin/classic/communicator/icons/lock-insecure.png (communicator/icons/lock-insecure.png) skin/classic/communicator/icons/loading.gif (communicator/icons/loading.gif) - skin/classic/communicator/icons/turbo-systray.gif (communicator/icons/turbo-systray.gif) skin/classic/communicator/icons/communicatoricons.png (communicator/icons/communicatoricons.png) skin/classic/communicator/icons/smileys/smile_n.gif (communicator/icons/smileys/smile_n.gif) skin/classic/communicator/icons/smileys/frown_n.gif (communicator/icons/smileys/frown_n.gif) diff --git a/suite/themes/modern/communicator/dialogs.css b/suite/themes/modern/communicator/dialogs.css index 6d27bcc2b0a..256184e07f5 100644 --- a/suite/themes/modern/communicator/dialogs.css +++ b/suite/themes/modern/communicator/dialogs.css @@ -42,10 +42,3 @@ @import url("chrome://communicator/skin/"); @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -/* ::::: turbo confirmation dialog ::::: */ - -#turboTrayImage { - list-style-image: url("chrome://communicator/skin/icons/turbo-systray.gif"); - border: 2px inset #C7D0D9 !important; -} diff --git a/suite/themes/modern/jar.mn b/suite/themes/modern/jar.mn index 45ba9de6309..a9347ccb1f5 100644 --- a/suite/themes/modern/jar.mn +++ b/suite/themes/modern/jar.mn @@ -40,7 +40,6 @@ modern.jar: skin/modern/communicator/icons/lock-secure.gif (communicator/icons/lock-secure.gif) skin/modern/communicator/icons/offline.gif (communicator/icons/offline.gif) skin/modern/communicator/icons/online.gif (communicator/icons/online.gif) - skin/modern/communicator/icons/turbo-systray.gif (communicator/icons/turbo-systray.gif) skin/modern/communicator/icons/btn1.gif (communicator/icons/btn1.gif) skin/modern/communicator/icons/search.gif (communicator/icons/search.gif) skin/modern/communicator/icons/smileys/smile_n.gif (communicator/icons/smileys/smile_n.gif)