diff --git a/mozilla/mail/components/prefwindow/content/pref-advanced.xul b/mozilla/mail/components/prefwindow/content/pref-advanced.xul index 41fe5ee27ac..9c1b2602dc8 100644 --- a/mozilla/mail/components/prefwindow/content/pref-advanced.xul +++ b/mozilla/mail/components/prefwindow/content/pref-advanced.xul @@ -1,5 +1,4 @@ - # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 # @@ -35,7 +34,7 @@ # 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 ***** --> +# ***** END LICENSE BLOCK ***** diff --git a/mozilla/mail/components/prefwindow/content/pref-fonts.js b/mozilla/mail/components/prefwindow/content/pref-fonts.js index f6ed3ff5630..39e1e0af95a 100644 --- a/mozilla/mail/components/prefwindow/content/pref-fonts.js +++ b/mozilla/mail/components/prefwindow/content/pref-fonts.js @@ -1,5 +1,4 @@ -/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - +# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- # ***** BEGIN LICENSE BLOCK ***** # Version: NPL 1.1/GPL 2.0/LGPL 2.1 # @@ -36,7 +35,7 @@ # the provisions above, a recipient may use your version of this file under # the terms of any one of the NPL, the GPL or the LGPL. # -# * ***** END LICENSE BLOCK ***** */ +# ***** END LICENSE BLOCK ***** try { diff --git a/mozilla/mail/components/prefwindow/content/pref-fonts.xul b/mozilla/mail/components/prefwindow/content/pref-fonts.xul index bfabd5f8031..abcd8a8b1cb 100644 --- a/mozilla/mail/components/prefwindow/content/pref-fonts.xul +++ b/mozilla/mail/components/prefwindow/content/pref-fonts.xul @@ -1,24 +1,23 @@ - -# The contents of this file are subject to the Netscape 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/NPL/ -# -# 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. -# -# The Original Code is Mozilla Communicator client code, released -# March 31, 1998. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): +# The contents of this file are subject to the Netscape 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/NPL/ +# +# 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. +# +# The Original Code is Mozilla Communicator client code, released +# March 31, 1998. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): diff --git a/mozilla/mail/components/prefwindow/content/pref-mailnews.xul b/mozilla/mail/components/prefwindow/content/pref-mailnews.xul index 10e821d3827..c8fd3901e81 100644 --- a/mozilla/mail/components/prefwindow/content/pref-mailnews.xul +++ b/mozilla/mail/components/prefwindow/content/pref-mailnews.xul @@ -1,5 +1,4 @@ - # The contents of this file are subject to the Netscape 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 diff --git a/mozilla/mail/components/prefwindow/content/pref-themes.js b/mozilla/mail/components/prefwindow/content/pref-themes.js index 34ba210a6fb..8d77773ed4f 100644 --- a/mozilla/mail/components/prefwindow/content/pref-themes.js +++ b/mozilla/mail/components/prefwindow/content/pref-themes.js @@ -1,40 +1,40 @@ -/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * 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. - * - * The Original Code is Mozilla.org Code. - * - * The Initial Developer of the Original Code is - * Doron Rosenberg. - * Portions created by the Initial Developer are Copyright (C) 2001 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Ben Goodger (Original Author) - * Blake Ross - * - * 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 ***** */ +# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# 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. +# +# The Original Code is Mozilla.org Code. +# +# The Initial Developer of the Original Code is +# Doron Rosenberg. +# Portions created by the Initial Developer are Copyright (C) 2001 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Ben Goodger (Original Author) +# Blake Ross +# +# 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 ***** var gData; diff --git a/mozilla/mail/components/prefwindow/content/pref-themes.xul b/mozilla/mail/components/prefwindow/content/pref-themes.xul index ec93b700ff1..d8e7e287aba 100644 --- a/mozilla/mail/components/prefwindow/content/pref-themes.xul +++ b/mozilla/mail/components/prefwindow/content/pref-themes.xul @@ -1,25 +1,23 @@ - +# The contents of this file are subject to the Netscape 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/NPL/ +# +# 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. +# +# The Original Code is Mozilla Communicator client code, released +# March 31, 1998. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998-1999 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): diff --git a/mozilla/mail/components/prefwindow/jar.mn b/mozilla/mail/components/prefwindow/jar.mn index 15fbf42159a..db6df770a2b 100644 --- a/mozilla/mail/components/prefwindow/jar.mn +++ b/mozilla/mail/components/prefwindow/jar.mn @@ -12,8 +12,8 @@ messenger.jar: comm.jar: + content/communicator/pref/pref.xul (content/pref.xul) *+ content/communicator/pref/nsPrefWindow.js (content/nsPrefWindow.js) -+ content/communicator/pref/pref-themes.xul (content/pref-themes.xul) -+ content/communicator/pref/pref-themes.js (content/pref-themes.js) +*+ content/communicator/pref/pref-themes.xul (content/pref-themes.xul) +*+ content/communicator/pref/pref-themes.js (content/pref-themes.js) * content/communicator/pref/pref-extensions.xul (content/pref-extensions.xul) * content/communicator/pref/pref-extensions.js (content/pref-extensions.js) *+ content/communicator/pref/pref-fonts.xul (content/pref-fonts.xul)