diff --git a/License.txt b/License.txt index 415f9f5d..563f5f2f 100644 --- a/License.txt +++ b/License.txt @@ -1,26 +1,23 @@ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 - -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - Copyright (c) 2006-2009 by Martin Stubenschrott -and the authors of the specific projects inside (see the AUTHORS file in each). + 2007-2009 by Doug Kearns + 2008-2009 by Kris Maglione -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. +For a full list of authors, refer the AUTHORS file. + +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. diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js index 8b7ef245..038313e1 100644 --- a/common/content/bookmarks.js +++ b/common/content/bookmarks.js @@ -1,30 +1,8 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ const DEFAULT_FAVICON = "chrome://mozapps/skin/places/defaultFavicon.png"; diff --git a/common/content/buffer.js b/common/content/buffer.js index dc5a14bd..647e4351 100644 --- a/common/content/buffer.js +++ b/common/content/buffer.js @@ -1,30 +1,8 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ /** @scope modules */ diff --git a/common/content/commands.js b/common/content/commands.js index f40e0cf5..3a736060 100644 --- a/common/content/commands.js +++ b/common/content/commands.js @@ -1,30 +1,8 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ /** @scope modules */ diff --git a/common/content/completion.js b/common/content/completion.js index 30740f2b..d1bdebb2 100644 --- a/common/content/completion.js +++ b/common/content/completion.js @@ -1,30 +1,8 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ /** @scope modules */ diff --git a/common/content/configbase.js b/common/content/configbase.js index a08762a8..41a5ada2 100644 --- a/common/content/configbase.js +++ b/common/content/configbase.js @@ -1,30 +1,8 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ const configbase = { //{{{ /** diff --git a/common/content/editor.js b/common/content/editor.js index 31bdfd2f..7533c3e1 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -1,39 +1,15 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ /** @scope modules */ // command names taken from: // http://developer.mozilla.org/en/docs/Editor_Embedding_Guide -/** - * @instance editor - */ +/** @instance editor */ function Editor() //{{{ { //////////////////////////////////////////////////////////////////////////////// diff --git a/common/content/eval.js b/common/content/eval.js index ff7310e2..dfd83b51 100644 --- a/common/content/eval.js +++ b/common/content/eval.js @@ -6,5 +6,10 @@ catch (e) } // IMPORTANT: The eval statement *must* remain on the first line // in order for line numbering in any errors to remain correct. + +// Copyright (c) 2008-2009 by Doug Kearns // +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. + // vim: set fdm=marker sw=4 ts=4 et: diff --git a/common/content/finder.js b/common/content/finder.js index c9b970c0..68d386c0 100644 --- a/common/content/finder.js +++ b/common/content/finder.js @@ -1,30 +1,7 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 - -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. /** @scope modules */ diff --git a/common/content/help.css b/common/content/help.css index c8107467..4b5ac1f4 100644 --- a/common/content/help.css +++ b/common/content/help.css @@ -1,31 +1,3 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 - -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ - div.main { font-family: -moz-fixed; white-space: -moz-pre-wrap; diff --git a/common/content/help.js b/common/content/help.js index 10bf0414..638e7037 100644 --- a/common/content/help.js +++ b/common/content/help.js @@ -1,3 +1,8 @@ +// Copyright (c) 2009 by Kris Maglione +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. + const win = Components.classes["@mozilla.org/embedcomp/window-watcher;1"] .getService(Ci.nsIWindowWatcher) diff --git a/common/content/hints.js b/common/content/hints.js index c01bca14..ef027578 100644 --- a/common/content/hints.js +++ b/common/content/hints.js @@ -1,36 +1,11 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ /** @scope modules */ - -/** - * @instance hints - */ +/** @instance hints */ function Hints() //{{{ { //////////////////////////////////////////////////////////////////////////////// diff --git a/common/content/io.js b/common/content/io.js index 6f94610a..1b94a2d6 100644 --- a/common/content/io.js +++ b/common/content/io.js @@ -1,31 +1,9 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// Copyright (c) 2006-2009 by Martin Stubenschrott +// Some code based on Venkman +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - Code based on venkman - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ /** @scope modules */ diff --git a/common/content/liberator-overlay.js b/common/content/liberator-overlay.js index b2cd0656..645e062d 100644 --- a/common/content/liberator-overlay.js +++ b/common/content/liberator-overlay.js @@ -1,3 +1,7 @@ +// Copyright (c) 2008-2009 Kris Maglione +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. (function () { const modules = {}; diff --git a/common/content/liberator.js b/common/content/liberator.js index 4b7d9ad4..13ae8479 100644 --- a/common/content/liberator.js +++ b/common/content/liberator.js @@ -1,30 +1,8 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ /** @scope modules */ diff --git a/common/content/liberator.xul b/common/content/liberator.xul index ea05cd2a..92800cce 100644 --- a/common/content/liberator.xul +++ b/common/content/liberator.xul @@ -1,31 +1,10 @@ diff --git a/common/content/mappings.js b/common/content/mappings.js index 32bf284d..eb4e032d 100644 --- a/common/content/mappings.js +++ b/common/content/mappings.js @@ -1,30 +1,8 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ /** @scope modules */ diff --git a/common/content/modes.js b/common/content/modes.js index f578084a..978df063 100644 --- a/common/content/modes.js +++ b/common/content/modes.js @@ -1,30 +1,7 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 - -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. /** @scope modules */ diff --git a/common/content/options.js b/common/content/options.js index 8eeb6ea8..1fff33be 100644 --- a/common/content/options.js +++ b/common/content/options.js @@ -1,30 +1,7 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 - -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. /** @scope modules */ diff --git a/common/content/sanitizer.js b/common/content/sanitizer.js index 6ac3ad21..99eca505 100644 --- a/common/content/sanitizer.js +++ b/common/content/sanitizer.js @@ -1,30 +1,7 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 - -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ +// Copyright (c) 2009 by Doug Kearns +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. // TODO: // - fix Sanitize autocommand diff --git a/common/content/services.js b/common/content/services.js index fa0d8ff0..778c250e 100644 --- a/common/content/services.js +++ b/common/content/services.js @@ -1,24 +1,7 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ - Copyright ©2008-2009 by Kris Maglione - - 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. -}}} ***** END LICENSE BLOCK *****/ +// Copyright (c) 2008-2009 by Kris Maglione +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. /** @scope modules */ diff --git a/common/content/style.js b/common/content/style.js index 1181f1c2..ec8a6cfe 100644 --- a/common/content/style.js +++ b/common/content/style.js @@ -1,24 +1,7 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ - Copyright ©2008-2009 by Kris Maglione - - 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. -}}} ***** END LICENSE BLOCK *****/ +// Copyright (c) 2008-2009 by Kris Maglione +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. /** @scope modules */ diff --git a/common/content/tabs.js b/common/content/tabs.js index e277833a..4d9fd1a8 100644 --- a/common/content/tabs.js +++ b/common/content/tabs.js @@ -1,30 +1,8 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ /** @scope modules */ diff --git a/common/content/template.js b/common/content/template.js index afb4774e..8a494366 100644 --- a/common/content/template.js +++ b/common/content/template.js @@ -1,24 +1,8 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ - Copyright ©2008-2009 by Kris Maglione +// Copyright (c) 2006-2009 by Kris Maglione +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. - 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. -}}} ***** END LICENSE BLOCK *****/ /** @scope modules */ diff --git a/common/content/ui.js b/common/content/ui.js index be9927c4..fbc5595c 100644 --- a/common/content/ui.js +++ b/common/content/ui.js @@ -1,30 +1,7 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 - -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. /** @scope modules */ diff --git a/common/content/util.js b/common/content/util.js index c0e9ad47..1f11bdd7 100644 --- a/common/content/util.js +++ b/common/content/util.js @@ -1,30 +1,7 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 - -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. /** @scope modules */ diff --git a/common/skin/liberator.css b/common/skin/liberator.css index 62b386b4..2b3e9cc6 100644 --- a/common/skin/liberator.css +++ b/common/skin/liberator.css @@ -1,31 +1,3 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 - -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ - @namespace liberator url("http://vimperator.org/namespaces/liberator"); /* Applied to all content */ diff --git a/muttator/License.txt b/muttator/License.txt deleted file mode 100644 index 39f969f2..00000000 --- a/muttator/License.txt +++ /dev/null @@ -1,25 +0,0 @@ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 - -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. diff --git a/muttator/components/chrome-data.js b/muttator/components/chrome-data.js index 6b9f194c..df8c1e04 100644 --- a/muttator/components/chrome-data.js +++ b/muttator/components/chrome-data.js @@ -1,29 +1,14 @@ +// Copyright (c) 2008-2009 Kris Maglione +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. + /* Adds support for data: URIs with chrome privileges * and fragment identifiers. * * "chrome-data:" [; ]* "," [] * * By Kris Maglione, ideas from Ed Anuff's nsChromeExtensionHandler. - * - * ©2008-2009 Kris Maglione - * - * 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. */ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); diff --git a/muttator/components/commandline-handler.js b/muttator/components/commandline-handler.js index c4057ca9..f73e4705 100644 --- a/muttator/components/commandline-handler.js +++ b/muttator/components/commandline-handler.js @@ -1,3 +1,9 @@ +// Copyright (c) 2009 by Doug Kearns +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. + + Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); function CommandLineHandler() diff --git a/muttator/content/addressbook.js b/muttator/content/addressbook.js index 8505f098..4697d4d4 100644 --- a/muttator/content/addressbook.js +++ b/muttator/content/addressbook.js @@ -1,30 +1,7 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 - -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2008 by Christian Dietrich - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ +// Copyright (c) 2008 by Christian Dietrich +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. function Addressbook() //{{{ { diff --git a/muttator/content/compose/compose.js b/muttator/content/compose/compose.js index 6dbe9fa7..a62a865d 100644 --- a/muttator/content/compose/compose.js +++ b/muttator/content/compose/compose.js @@ -1,30 +1,7 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 - -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. function Compose() //{{{ { diff --git a/muttator/content/compose/compose.xul b/muttator/content/compose/compose.xul index a0db3f57..6176be1f 100644 --- a/muttator/content/compose/compose.xul +++ b/muttator/content/compose/compose.xul @@ -1,31 +1,10 @@ diff --git a/muttator/content/compose/liberator.xul b/muttator/content/compose/liberator.xul index d26700a7..27fa65a9 100644 --- a/muttator/content/compose/liberator.xul +++ b/muttator/content/compose/liberator.xul @@ -1,31 +1,10 @@ diff --git a/muttator/content/config.js b/muttator/content/config.js index f818c5ad..0cdf30f6 100644 --- a/muttator/content/config.js +++ b/muttator/content/config.js @@ -1,30 +1,7 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 - -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. const config = (function () //{{{ { diff --git a/muttator/content/mail.js b/muttator/content/mail.js index 54d89b87..b3fe77d8 100755 --- a/muttator/content/mail.js +++ b/muttator/content/mail.js @@ -1,30 +1,7 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 - -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. function Mail() //{{{ { diff --git a/muttator/content/muttator.xul b/muttator/content/muttator.xul index 1ecc3bbe..13151dcd 100644 --- a/muttator/content/muttator.xul +++ b/muttator/content/muttator.xul @@ -1,31 +1,10 @@ diff --git a/vimperator/Donors b/vimperator/Donors index 9f9c7186..78ec6cfd 100644 --- a/vimperator/Donors +++ b/vimperator/Donors @@ -2,6 +2,10 @@ Continuous donations: * Daniel Bainton (web hosting) 2009: +* Tony Rein +* Daniel Bentsur +* Ganesh Hegde +* Elbert Hannah * Oliver Schaefer (2nd donation this year, and largest one in 2009! - Thanks!) * James Davis * Gregg Archer diff --git a/vimperator/NEWS b/vimperator/NEWS index 999f5137..2926fb53 100644 --- a/vimperator/NEWS +++ b/vimperator/NEWS @@ -1,5 +1,7 @@ 2009-XX-XX: * version 2.2a1pre + * IMPORTANT: Vimperator is from now on ONLY licensed unter the MIT + license, if you need a GPL, LGPL or MPL version, please use Vimperator 2.1 * IMPORTANT: Map.flags has been replaced with individual properties. Mappings defined in plugins with mappings.add will need to be updated. ................................... diff --git a/vimperator/components/about-handler.js b/vimperator/components/about-handler.js index 88553282..6476f214 100644 --- a/vimperator/components/about-handler.js +++ b/vimperator/components/about-handler.js @@ -1,3 +1,8 @@ +// Copyright (c) 2009 by Doug Kearns +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. + Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); const Cc = Components.classes; diff --git a/vimperator/components/chrome-data.js b/vimperator/components/chrome-data.js index 6b9f194c..62fe8fbb 100644 --- a/vimperator/components/chrome-data.js +++ b/vimperator/components/chrome-data.js @@ -1,3 +1,9 @@ +// Copyright (c) 2008-2009 Kris Maglione +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. + + /* Adds support for data: URIs with chrome privileges * and fragment identifiers. * @@ -5,7 +11,6 @@ * * By Kris Maglione, ideas from Ed Anuff's nsChromeExtensionHandler. * - * ©2008-2009 Kris Maglione * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/vimperator/components/commandline-handler.js b/vimperator/components/commandline-handler.js index 683ed152..054f6369 100644 --- a/vimperator/components/commandline-handler.js +++ b/vimperator/components/commandline-handler.js @@ -1,3 +1,9 @@ +// Copyright (c) 2009 by Doug Kearns +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. + + Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); function CommandLineHandler() diff --git a/vimperator/content/config.js b/vimperator/content/config.js index d9ce1e6f..f73ebb05 100644 --- a/vimperator/content/config.js +++ b/vimperator/content/config.js @@ -1,30 +1,8 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ const config = { //{{{ /*** required options, no checks done if they really exist, so be careful ***/ diff --git a/vimperator/content/vimperator.xul b/vimperator/content/vimperator.xul index 4350de7f..01fb13ab 100644 --- a/vimperator/content/vimperator.xul +++ b/vimperator/content/vimperator.xul @@ -1,31 +1,10 @@ diff --git a/vimperator/locale/en-US/help.js b/vimperator/locale/en-US/help.js index 27413a00..54c86b21 100644 --- a/vimperator/locale/en-US/help.js +++ b/vimperator/locale/en-US/help.js @@ -1,3 +1,8 @@ +// Copyright (c) 2009 by Doug Kearns +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. + function checkFragment() { diff --git a/vimperator/regressions.js b/vimperator/regressions.js index c173aa3d..471104a9 100644 --- a/vimperator/regressions.js +++ b/vimperator/regressions.js @@ -1,3 +1,9 @@ +// Copyright (c) 2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. + + // Script to find regressions // // It should use as few liberator methods as possible, but fall back to standard mozilla/DOM methods diff --git a/xulmus/components/chrome-data.js b/xulmus/components/chrome-data.js index 6b9f194c..0c162296 100644 --- a/xulmus/components/chrome-data.js +++ b/xulmus/components/chrome-data.js @@ -1,3 +1,9 @@ +// Copyright (c) 2008-2009 by Kris Maglione +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. + + /* Adds support for data: URIs with chrome privileges * and fragment identifiers. * diff --git a/xulmus/components/commandline-handler.js b/xulmus/components/commandline-handler.js index 3c7f8d9f..8401cda1 100644 --- a/xulmus/components/commandline-handler.js +++ b/xulmus/components/commandline-handler.js @@ -1,3 +1,9 @@ +// Copyright (c) 2009 by Doug Kearns +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. + + Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); function CommandLineHandler() diff --git a/xulmus/content/config.js b/xulmus/content/config.js index a1e9df38..546a82c7 100644 --- a/xulmus/content/config.js +++ b/xulmus/content/config.js @@ -1,30 +1,8 @@ -/***** BEGIN LICENSE BLOCK ***** {{{ -Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// Copyright (c) 2006-2009 by Martin Stubenschrott +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. -The contents of this file are subject to the Mozilla Public License Version -1.1 (the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at -http://www.mozilla.org/MPL/ - -Software distributed under the License is distributed on an "AS IS" basis, -WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -for the specific language governing rights and limitations under the -License. - -Copyright (c) 2006-2009 by Martin Stubenschrott - -Alternatively, the contents of this file may be used under the terms of -either the GNU General Public License Version 2 or later (the "GPL"), or -the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -in which case the provisions of the GPL or the LGPL are applicable instead -of those above. If you wish to allow use of your version of this file only -under the terms of either the GPL or the LGPL, and not to allow others to -use your version of this file under the terms of the MPL, indicate your -decision by deleting the provisions above and replace them with the notice -and other provisions required by the GPL or the LGPL. If you do not delete -the provisions above, a recipient may use your version of this file under -the terms of any one of the MPL, the GPL or the LGPL. -}}} ***** END LICENSE BLOCK *****/ Components.utils.import("resource://gre/modules/utils.js"); // XXX diff --git a/xulmus/content/library.js b/xulmus/content/library.js index a0b33f1c..a914d730 100644 --- a/xulmus/content/library.js +++ b/xulmus/content/library.js @@ -1,3 +1,9 @@ +// Copyright (c) 2009 by Prathyush Thota +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. + + function Library() // {{{ { //////////////////////////////////////////////////////////////////////////////// diff --git a/xulmus/content/player.js b/xulmus/content/player.js index 2697fe07..18955dcc 100644 --- a/xulmus/content/player.js +++ b/xulmus/content/player.js @@ -1,3 +1,9 @@ +// Copyright (c) 2009 by Prathyush Thota +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. + + function Player() // {{{ { //////////////////////////////////////////////////////////////////////////////// diff --git a/xulmus/locale/en-US/help.js b/xulmus/locale/en-US/help.js index ece4273f..ffed030a 100644 --- a/xulmus/locale/en-US/help.js +++ b/xulmus/locale/en-US/help.js @@ -1,3 +1,7 @@ +// Copyright (c) 2009 by Doug Kearns +// +// This work is licensed for reuse under an MIT license. Details are +// given in the LICENSE.txt file included with this file. function checkFragment() {