From c50f649da21d07a691045c3206ec0e0c89070080 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Fri, 31 Aug 2018 08:52:13 -0500 Subject: [PATCH] Convert to all MPL-2.0, Fixes #36 --- chrome/thunderlink/content/license.txt | 23 ------------ chrome/thunderlink/content/preferences.js | 20 +++------- chrome/thunderlink/content/preferences.xul | 12 ++++++ .../content/thunderlink-overlay.xul | 11 ++++++ chrome/thunderlink/content/thunderlink.js | 16 ++------ components/thunderlinkCommandLineHandler.js | 37 +++++-------------- defaults/preferences/thunderlink.js | 10 +++++ 7 files changed, 52 insertions(+), 77 deletions(-) delete mode 100755 chrome/thunderlink/content/license.txt diff --git a/chrome/thunderlink/content/license.txt b/chrome/thunderlink/content/license.txt deleted file mode 100755 index 45f04c2..0000000 --- a/chrome/thunderlink/content/license.txt +++ /dev/null @@ -1,23 +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. - -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/chrome/thunderlink/content/preferences.js b/chrome/thunderlink/content/preferences.js index 44bc0d0..0163e89 100644 --- a/chrome/thunderlink/content/preferences.js +++ b/chrome/thunderlink/content/preferences.js @@ -1,23 +1,13 @@ /* ThunderLink. - Link from your browser to your email messages! + Link from your browser to your email messages! Copyright (C) 2011 Christoph Zwirello - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see - */ - - + 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/. +*/ var ThunderLinkPrefNS = { diff --git a/chrome/thunderlink/content/preferences.xul b/chrome/thunderlink/content/preferences.xul index bf9ee80..2414c01 100644 --- a/chrome/thunderlink/content/preferences.xul +++ b/chrome/thunderlink/content/preferences.xul @@ -1,4 +1,16 @@ + + + diff --git a/chrome/thunderlink/content/thunderlink-overlay.xul b/chrome/thunderlink/content/thunderlink-overlay.xul index d794ba9..c9d2c2d 100755 --- a/chrome/thunderlink/content/thunderlink-overlay.xul +++ b/chrome/thunderlink/content/thunderlink-overlay.xul @@ -1,5 +1,16 @@ + +