diff options
Diffstat (limited to 'toolkit/content')
| -rw-r--r-- | toolkit/content/browser-content.js | 14 | ||||
| -rw-r--r-- | toolkit/content/license.html | 36 | ||||
| -rw-r--r-- | toolkit/content/moz.build | 1 |
3 files changed, 12 insertions, 39 deletions
diff --git a/toolkit/content/browser-content.js b/toolkit/content/browser-content.js index 2276f8a0d..d6185c5dd 100644 --- a/toolkit/content/browser-content.js +++ b/toolkit/content/browser-content.js @@ -483,8 +483,18 @@ var Printing = { printSettings.printerName = PSSVC.defaultPrinterName; } // First get any defaults from the printer - PSSVC.initPrintSettingsFromPrinter(printSettings.printerName, - printSettings); + try { + PSSVC.initPrintSettingsFromPrinter(printSettings.printerName, + printSettings); + } catch(e) { + // The printer name specified was invalid or there was an O.S. error. + Components.utils.reportError("Invalid printer: " + printSettings.printerName); + Services.prefs.clearUserPref("print.print_printer"); + // Try again with default + printSettings.printerName = PSSVC.defaultPrinterName; + PSSVC.initPrintSettingsFromPrinter(printSettings.printerName, + printSettings); + } // now augment them with any values from last time PSSVC.initPrintSettingsFromPrefs(printSettings, true, printSettings.kInitSaveAll); diff --git a/toolkit/content/license.html b/toolkit/content/license.html index 1041ec42f..d97a3c7f1 100644 --- a/toolkit/content/license.html +++ b/toolkit/content/license.html @@ -67,9 +67,6 @@ </li> <li><a href="about:license#ACE">ACE License</a></li> <li><a href="about:license#acorn">acorn License</a></li> -#ifdef MOZ_INSTALL_TRACKING - <li><a href="about:license#adjust">Adjust SDK License</a></li> -#endif <li><a href="about:license#adobecmap">Adobe CMap License</a></li> <li><a href="about:license#android">Android Open Source License</a></li> <li><a href="about:license#angle">ANGLE License</a></li> @@ -2233,39 +2230,6 @@ licences. <hr> -#ifdef MOZ_INSTALL_TRACKING - <h1><a id="adjust"></a>Adjust SDK License</h1> - - <p>This license applies to all files in the directory - <span class="path">mobile/android/thirdparty/com/adjust/sdk</span>.</p> - -<pre> -Copyright (c) 2012-2014 adjust GmbH, -http://www.adjust.com - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -</pre> - - <hr> - -#endif <h1><a id="apache"></a>Apache License 2.0</h1> <p>This license applies to various files in the Mozilla codebase.</p> diff --git a/toolkit/content/moz.build b/toolkit/content/moz.build index 0a08483b4..551ceaa1d 100644 --- a/toolkit/content/moz.build +++ b/toolkit/content/moz.build @@ -1,5 +1,4 @@ # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. |