--- a/mail/base/content/ABSearchDialog.js
+++ b/mail/base/content/ABSearchDialog.js
@@ -1,11 +1,11 @@
-# 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/.
+/* 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/. */
Components.utils.import("resource:///modules/mailServices.js");
var searchSessionContractID = "@mozilla.org/messenger/searchSession;1";
var gSearchSession;
var nsMsgSearchScope = Components.interfaces.nsMsgSearchScope;
var nsIMsgSearchTerm = Components.interfaces.nsIMsgSearchTerm;
--- a/mail/base/content/ABSearchDialog.xul
+++ b/mail/base/content/ABSearchDialog.xul
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-# 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/.
+<!-- 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/. -->
<?xml-stylesheet href="chrome://messenger/skin/searchDialog.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/addressbook/abResultsPane.css" type="text/css"?>
<?xul-overlay href="chrome://messenger/content/searchTermOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
<!DOCTYPE window [
--- a/mail/base/content/FilterListDialog.xul
+++ b/mail/base/content/FilterListDialog.xul
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
-# 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/.
+<!-- 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/. -->
<?xml-stylesheet href="chrome://messenger/skin/filterDialog.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
<!DOCTYPE window [
<!ENTITY % filtersDTD SYSTEM "chrome://messenger/locale/FilterListDialog.dtd">%filtersDTD;
<!ENTITY % pickerDTD SYSTEM "chrome://messenger/locale/msgFolderPickerOverlay.dtd"> %pickerDTD;
--- a/mail/base/content/configEditorOverlay.xul
+++ b/mail/base/content/configEditorOverlay.xul
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
-# 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/.
+<!-- 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/. -->
<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/configEditorOverlay.dtd">
<overlay id="configEditorOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<window id="config">
<keyset id="configEditorOverlayKeys">
<key key="&closeCmd.key;" modifiers="accel" oncommand="window.close();"/>
--- a/mail/base/content/hiddenWindow.js
+++ b/mail/base/content/hiddenWindow.js
@@ -1,12 +1,12 @@
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-# 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/.
+/* -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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/. */
function hiddenWindowStartup()
{
// Disable menus which are not appropriate
var disabledItems = [
'menu_newFolder', 'newMailAccountMenuItem', 'newAccountMenuItem',
'menu_close', 'menu_saveAs', 'menu_saveAsFile', 'menu_newVirtualFolder',
'menu_find', 'menu_findCmd', 'menu_findAgainCmd', 'menu_sendunsentmsgs',
--- a/mail/base/content/mail-offline.js
+++ b/mail/base/content/mail-offline.js
@@ -1,12 +1,12 @@
-# -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# 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/.
+/* -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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 MailOfflineMgr = {
offlineManager: null,
offlineBundle: null,
init: function()
{
var os = Components.classes["@mozilla.org/observer-service;1"]
--- a/mail/base/content/mailCommands.js
+++ b/mail/base/content/mailCommands.js
@@ -1,12 +1,12 @@
-# -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# 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/.
+/* -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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/. */
Components.utils.import("resource:///modules/mailServices.js");
/**
* Get the identity that most likely is the best one to use, given the hint.
* @param identities nsISupportsArray<nsIMsgIdentity> of identities
* @param optionalHint string containing comma separated mailboxes
*/
--- a/mail/base/content/msgPrintEngine.xul
+++ b/mail/base/content/msgPrintEngine.xul
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-#
-# 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/.
+<!--
+ - 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/. -->
<?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
<window id="printEngineWin"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="OnLoadPrintEngine()"
--- a/mail/base/content/msgSelectOffline.xul
+++ b/mail/base/content/msgSelectOffline.xul
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
-# 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/.
+<!-- 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/. -->
<?xml-stylesheet href="chrome://messenger/skin/msgSelectOffline.css" type="text/css"?>
<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/msgSynchronize.dtd" >
<dialog xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="select-offline"
--- a/mail/base/content/newmailalert.xul
+++ b/mail/base/content/newmailalert.xul
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-# 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/.
+<!-- 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/. -->
<?xml-stylesheet href="chrome://messenger/skin/newmailalert.css" type="text/css"?>
<window id="newMailAlertNotification"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
windowtype="alert:alert"
role="alert"
align="start"
--- a/mail/base/content/subscribe.xul
+++ b/mail/base/content/subscribe.xul
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-# 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/.
+<!-- 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/. -->
<?xml-stylesheet href="chrome://messenger/skin/subscribe.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/subscribe.dtd">
<dialog id="subscribeWindow"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
--- a/mail/base/content/systemIntegrationDialog.js
+++ b/mail/base/content/systemIntegrationDialog.js
@@ -1,12 +1,12 @@
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+/* -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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/. */
// this dialog can only be opened if we have a shell service
var gSystemIntegrationDialog = {
/// Whether the search integration checkbox is disabled or hidden
_searchCheckboxInactive: false,
onLoad: function ()
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -20,67 +20,67 @@ messenger.jar:
content/messenger/extraCustomizeItems.xul (content/extraCustomizeItems.xul)
* content/messenger/mailOverlay.xul (content/mailOverlay.xul)
* content/messenger/messageWindow.xul (content/messageWindow.xul)
content/messenger/messageWindow.js (content/messageWindow.js)
content/messenger/mailContextMenus.js (content/mailContextMenus.js)
content/messenger/nsContextMenu.js (content/nsContextMenu.js)
* content/messenger/messenger.xul (content/messenger.xul)
* content/messenger/hiddenWindow.xul (content/hiddenWindow.xul)
-* content/messenger/hiddenWindow.js (content/hiddenWindow.js)
+ content/messenger/hiddenWindow.js (content/hiddenWindow.js)
content/messenger/msgHdrViewOverlay.js (content/msgHdrViewOverlay.js)
content/messenger/msgHdrViewOverlay.xul (content/msgHdrViewOverlay.xul)
content/messenger/msgViewNavigation.js (content/msgViewNavigation.js)
content/messenger/mailWidgets.xml (content/mailWidgets.xml)
content/messenger/editContactOverlay.js (content/editContactOverlay.js)
* content/messenger/editContactOverlay.xul (content/editContactOverlay.xul)
content/messenger/msgMail3PaneWindow.js (content/msgMail3PaneWindow.js)
content/messenger/mail3PaneWindowCommands.js (content/mail3PaneWindowCommands.js)
-* content/messenger/mailCommands.js (content/mailCommands.js)
+ content/messenger/mailCommands.js (content/mailCommands.js)
* content/messenger/mailCore.js (content/mailCore.js)
-* content/messenger/customizeToolbarOverlay.xul (content/customizeToolbarOverlay.xul)
+ content/messenger/customizeToolbarOverlay.xul (content/customizeToolbarOverlay.xul)
content/messenger/mailTabs.js (content/mailTabs.js)
content/messenger/commandglue.js (content/commandglue.js)
content/messenger/widgetglue.js (content/widgetglue.js)
* content/messenger/SearchDialog.xul (content/SearchDialog.xul)
content/messenger/SearchDialog.js (content/SearchDialog.js)
-* content/messenger/ABSearchDialog.xul (content/ABSearchDialog.xul)
-* content/messenger/ABSearchDialog.js (content/ABSearchDialog.js)
-* content/messenger/FilterListDialog.xul (content/FilterListDialog.xul)
-* content/messenger/FilterListDialog.js (content/FilterListDialog.js)
+ content/messenger/ABSearchDialog.xul (content/ABSearchDialog.xul)
+ content/messenger/ABSearchDialog.js (content/ABSearchDialog.js)
+ content/messenger/FilterListDialog.xul (content/FilterListDialog.xul)
+ content/messenger/FilterListDialog.js (content/FilterListDialog.js)
* content/messenger/plugins.js (content/plugins.js)
content/messenger/specialTabs.js (content/specialTabs.js)
content/messenger/specialTabs.xul (content/specialTabs.xul)
content/messenger/webSearch.xml (content/webSearch.xml)
content/messenger/webSearchTab.xul (content/webSearchTab.xul)
content/messenger/webSearchTab.js (content/webSearchTab.js)
-* content/messenger/subscribe.xul (content/subscribe.xul)
+ content/messenger/subscribe.xul (content/subscribe.xul)
content/messenger/subscribe.js (content/subscribe.js)
* content/messenger/aboutDialog.xul (content/aboutDialog.xul)
* content/messenger/aboutDialog.js (content/aboutDialog.js)
* content/messenger/aboutRights.xhtml (content/aboutRights.xhtml)
* content/messenger/systemIntegrationDialog.xul (content/systemIntegrationDialog.xul)
-* content/messenger/systemIntegrationDialog.js (content/systemIntegrationDialog.js)
+ content/messenger/systemIntegrationDialog.js (content/systemIntegrationDialog.js)
content/messenger/folderPane.js (content/folderPane.js)
-* content/messenger/msgSelectOffline.xul (content/msgSelectOffline.xul)
-* content/messenger/msgPrintEngine.xul (content/msgPrintEngine.xul)
+ content/messenger/msgSelectOffline.xul (content/msgSelectOffline.xul)
+ content/messenger/msgPrintEngine.xul (content/msgPrintEngine.xul)
content/messenger/searchBar.js (content/searchBar.js)
content/messenger/phishingDetector.js (content/phishingDetector.js)
-* content/messenger/mail-offline.js (content/mail-offline.js)
+ content/messenger/mail-offline.js (content/mail-offline.js)
content/messenger/aboutDialog.css (content/aboutDialog.css)
content/messenger/messenger.css (content/messenger.css)
content/messenger/search.xml (content/search.xml)
content/messenger/tabmail.xml (content/tabmail.xml)
content/messenger/tabmail.css (content/tabmail.css)
-* content/messenger/newmailalert.xul (content/newmailalert.xul)
+ content/messenger/newmailalert.xul (content/newmailalert.xul)
content/messenger/newmailalert.js (content/newmailalert.js)
content/messenger/newTagDialog.xul (content/newTagDialog.xul)
content/messenger/newTagDialog.js (content/newTagDialog.js)
* content/messenger/viewSourceOverlay.xul (content/viewSourceOverlay.xul)
-* content/messenger/configEditorOverlay.xul (content/configEditorOverlay.xul)
+ content/messenger/configEditorOverlay.xul (content/configEditorOverlay.xul)
content/messenger/EdSpellCheckOverlay.xul (content/EdSpellCheckOverlay.xul)
content/messenger/EdSpellCheckOverlay.js (content/EdSpellCheckOverlay.js)
content/messenger/composerOverlay.css (content/composerOverlay.css)
content/messenger/threadPane.js (content/threadPane.js)
content/messenger/threadPaneColumnPicker.xml (content/threadPaneColumnPicker.xml)
content/messenger/protovis-r2.6-modded.js (content/protovis-r2.6-modded.js)
#ifdef XP_MACOSX
content/messenger/macMenuOverlay.xul (content/macMenuOverlay.xul)
@@ -108,15 +108,15 @@ messenger.jar:
* content/messenger/safeMode.xul (content/safeMode.xul)
content/messenger/safeMode.js (content/safeMode.js)
# the following files are mail-specific overrides
*+ content/messenger/license.html (/mozilla/toolkit/content/license.html)
% override chrome://global/content/license.html chrome://messenger/content/license.html
comm.jar:
% content communicator %content/communicator/
-* content/communicator/contentAreaClick.js (content/contentAreaClick.js)
+ content/communicator/contentAreaClick.js (content/contentAreaClick.js)
* content/communicator/utilityOverlay.xul (content/utilityOverlay.xul)
content/communicator/utilityOverlay.js (content/utilityOverlay.js)
toolkit.jar:
% overlay chrome://global/content/customizeToolbar.xul chrome://messenger/content/customizeToolbarOverlay.xul
% overlay chrome://mozapps/content/downloads/downloads.xul chrome://messenger/content/downloadsOverlay.xul
--- a/mail/branding/aurora/jar.mn
+++ b/mail/branding/aurora/jar.mn
@@ -5,9 +5,9 @@
messenger.jar:
% content branding %content/branding/
content/branding/about-background.png (content/about-background.png)
content/branding/about-logo.png (content/about-logo.png)
content/branding/about-wordmark.png (content/about-wordmark.png)
content/branding/about.png (content/about.png)
content/branding/icon48.png (content/icon48.png)
content/branding/icon64.png (content/icon64.png)
-* content/branding/aboutDialog.css (content/aboutDialog.css)
+ content/branding/aboutDialog.css (content/aboutDialog.css)
--- a/mail/branding/nightly/jar.mn
+++ b/mail/branding/nightly/jar.mn
@@ -5,9 +5,9 @@
messenger.jar:
% content branding %content/branding/
content/branding/about-background.png (content/about-background.png)
content/branding/about-logo.png (content/about-logo.png)
content/branding/about-wordmark.png (content/about-wordmark.png)
content/branding/about.png (content/about.png)
content/branding/icon48.png (content/icon48.png)
content/branding/icon64.png (content/icon64.png)
-* content/branding/aboutDialog.css (content/aboutDialog.css)
+ content/branding/aboutDialog.css (content/aboutDialog.css)
--- a/mail/components/activity/jar.mn
+++ b/mail/components/activity/jar.mn
@@ -1,10 +1,10 @@
# 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/.
messenger.jar:
content/messenger/activity.js (content/activity.js)
* content/messenger/activity.xul (content/activity.xul)
-* content/messenger/activity.xml (content/activity.xml)
+ content/messenger/activity.xml (content/activity.xml)
content/messenger/activityBinding.css (content/activityBinding.css)
--- a/mail/components/addrbook/content/abCardOverlay.js
+++ b/mail/components/addrbook/content/abCardOverlay.js
@@ -1,12 +1,12 @@
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-# 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/.
+/* -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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/. */
Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource:///modules/mailServices.js");
const kNonVcardFields =
["NickNameContainer", "SecondaryEmailContainer", "ScreenNameContainer",
"customFields", "allowRemoteContent", "preferDisplayName"];
--- a/mail/components/addrbook/content/abCardViewOverlay.js
+++ b/mail/components/addrbook/content/abCardViewOverlay.js
@@ -1,12 +1,12 @@
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# 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/.
+/* -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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/. */
//NOTE: gAddressBookBundle must be defined and set or this Overlay won't work
Components.utils.import("resource://gre/modules/Services.jsm");
var gProfileDirURL;
var gMapItURLFormat = Services.prefs.getComplexValue("mail.addr_book.mapit_url.format",
--- a/mail/components/addrbook/content/abCommon.js
+++ b/mail/components/addrbook/content/abCommon.js
@@ -1,11 +1,11 @@
-# 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/.
+/* 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/. */
Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource:///modules/mailServices.js");
var gDirTree;
var abList = 0;
var gAbResultsTree = null;
var gAbView = null;
--- a/mail/components/addrbook/content/abContactsPanel.xul
+++ b/mail/components/addrbook/content/abContactsPanel.xul
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
-# -*- Mode: xml; indent-tabs-mode: nil; -*-
-# 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/.
+<!-- -*- Mode: xml; indent-tabs-mode: nil; -*-
+ - 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/. -->
<?xml-stylesheet href="chrome://messenger/skin/addressbook/abContactsPanel.css" type="text/css"?>
<!DOCTYPE page [
<!ENTITY % abResultsPaneOverlayDTD SYSTEM "chrome://messenger/locale/addressbook/abResultsPaneOverlay.dtd" >
%abResultsPaneOverlayDTD;
<!ENTITY % abContactsPanelDTD SYSTEM "chrome://messenger/locale/addressbook/abContactsPanel.dtd" >
--- a/mail/components/addrbook/content/abEditListDialog.xul
+++ b/mail/components/addrbook/content/abEditListDialog.xul
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-# 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/.
+<!-- 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/. -->
<?xml-stylesheet href="chrome://messenger/skin/addressbook/cardDialog.css" type="text/css"?>
<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">
<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="ablistWindow"
title="&mailListWindow.title;"
--- a/mail/components/addrbook/content/abMailListDialog.xul
+++ b/mail/components/addrbook/content/abMailListDialog.xul
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-# 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/.
+<!-- 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/. -->
<?xml-stylesheet href="chrome://messenger/skin/addressbook/cardDialog.css" type="text/css"?>
<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">
<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="ablistWindow"
title="&mailListWindow.title;"
--- a/mail/components/addrbook/content/addressbook.js
+++ b/mail/components/addrbook/content/addressbook.js
@@ -1,12 +1,12 @@
-# -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# 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/.
+/* -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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/. */
Components.utils.import("resource://gre/modules/Services.jsm");
// Ensure the activity modules are loaded for this window.
Components.utils.import("resource:///modules/activity/activityModules.js");
Components.utils.import("resource:///modules/mailServices.js");
const nsIAbListener = Components.interfaces.nsIAbListener;
const kPrefMailAddrBookLastNameFirst = "mail.addr_book.lastnamefirst";
--- a/mail/components/addrbook/jar.mn
+++ b/mail/components/addrbook/jar.mn
@@ -1,16 +1,16 @@
# 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/.
messenger.jar:
-* content/messenger/addressbook/abCardViewOverlay.js (content/abCardViewOverlay.js)
-* content/messenger/addressbook/addressbook.js (content/addressbook.js)
+ content/messenger/addressbook/abCardViewOverlay.js (content/abCardViewOverlay.js)
+ content/messenger/addressbook/addressbook.js (content/addressbook.js)
* content/messenger/addressbook/addressbook.xul (content/addressbook.xul)
-* content/messenger/addressbook/abCommon.js (content/abCommon.js)
-* content/messenger/addressbook/abCardOverlay.js (content/abCardOverlay.js)
+ content/messenger/addressbook/abCommon.js (content/abCommon.js)
+ content/messenger/addressbook/abCardOverlay.js (content/abCardOverlay.js)
content/messenger/addressbook/abCardOverlay.xul (content/abCardOverlay.xul)
-* content/messenger/addressbook/abEditListDialog.xul (content/abEditListDialog.xul)
-* content/messenger/addressbook/abMailListDialog.xul (content/abMailListDialog.xul)
-* content/messenger/addressbook/abContactsPanel.xul (content/abContactsPanel.xul)
-* content/messenger/addressbook/abContactsPanel.js (content/abContactsPanel.js)
+ content/messenger/addressbook/abEditListDialog.xul (content/abEditListDialog.xul)
+ content/messenger/addressbook/abMailListDialog.xul (content/abMailListDialog.xul)
+ content/messenger/addressbook/abContactsPanel.xul (content/abContactsPanel.xul)
+ content/messenger/addressbook/abContactsPanel.js (content/abContactsPanel.js)
content/messenger/addressbook/abTrees.js (content/abTrees.js)
--- a/mail/components/compose/content/addressingWidgetOverlay.js
+++ b/mail/components/compose/content/addressingWidgetOverlay.js
@@ -1,12 +1,12 @@
-# -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# 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/.
+/* -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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/. */
top.MAX_RECIPIENTS = 1; /* for the initial listitem created in the XUL */
var inputElementType = "";
var selectElementType = "";
var selectElementIndexTable = null;
var gNumberOfCols = 0;
--- a/mail/components/compose/jar.mn
+++ b/mail/components/compose/jar.mn
@@ -6,12 +6,12 @@ messenger.jar:
% overlay chrome://editor/content/EdImageOverlay.xul chrome://messenger/content/messengercompose/mailComposeEditorOverlay.xul
% overlay chrome://editor/content/EdImageOverlay.xul chrome://messenger/content/messengercompose/EdImageOverlayOverlay.xul
% overlay chrome://editor/content/EdLinkProps.xul chrome://messenger/content/messengercompose/mailComposeEditorOverlay.xul
* content/messenger/messengercompose/messengercompose.xul (content/messengercompose.xul)
content/messenger/messengercompose/MsgComposeCommands.js (content/MsgComposeCommands.js)
content/messenger/messengercompose/bigFileObserver.js (content/bigFileObserver.js)
content/messenger/messengercompose/cloudAttachmentLinkManager.js (content/cloudAttachmentLinkManager.js)
content/messenger/messengercompose/EdImageOverlayOverlay.xul (content/EdImageOverlayOverlay.xul)
-* content/messenger/messengercompose/addressingWidgetOverlay.js (content/addressingWidgetOverlay.js)
+ content/messenger/messengercompose/addressingWidgetOverlay.js (content/addressingWidgetOverlay.js)
comm.jar:
-*+ content/editor/editorOverlay.xul (content/editorOverlay.xul)
++ content/editor/editorOverlay.xul (content/editorOverlay.xul)
--- a/mail/components/im/content/imContextMenu.js
+++ b/mail/components/im/content/imContextMenu.js
@@ -1,11 +1,11 @@
-# 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/.
+/* 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 gChatContextMenu = null;
function imContextMenu(aXulMenu) {
this.target = null;
this.menu = null;
this.onLink = false;
this.onMailtoLink = false;
--- a/mail/components/im/jar.mn
+++ b/mail/components/im/jar.mn
@@ -15,17 +15,17 @@ messenger.jar:
content/messenger/chat/joinchat.js (content/joinchat.js)
content/messenger/chat/joinchat.xul (content/joinchat.xul)
content/messenger/chat/imAccount.xml (content/imAccount.xml)
content/messenger/chat/imAccounts.css (content/imAccounts.css)
content/messenger/chat/imAccounts.js (content/imAccounts.js)
content/messenger/chat/imAccounts.xul (content/imAccounts.xul)
content/messenger/chat/imAccountWizard.xul (content/imAccountWizard.xul)
content/messenger/chat/imAccountWizard.js (content/imAccountWizard.js)
-* content/messenger/chat/imContextMenu.js (content/imContextMenu.js)
+ content/messenger/chat/imContextMenu.js (content/imContextMenu.js)
content/messenger/chat/imStatusSelector.js (content/imStatusSelector.js)
content/messenger/chat/imbuddytooltip.xml (content/imbuddytooltip.xml)
content/messenger/chat/imcontact.xml (content/imcontact.xml)
* content/messenger/chat/imconversation.xml (content/imconversation.xml)
content/messenger/chat/imconv.xml (content/imconv.xml)
content/messenger/chat/imgroup.xml (content/imgroup.xml)
% skin messenger-messagestyles classic/1.0 %skin/classic/messenger/messages/
skin/classic/messenger/messages/Bitmaps/minus-hover.png (messages/Bitmaps/minus-hover.png)
--- a/mail/components/migration/content/migration.js
+++ b/mail/components/migration/content/migration.js
@@ -1,11 +1,11 @@
-# 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/.
+/* 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/. */
const kIMig = Components.interfaces.nsIMailProfileMigrator;
const kIPStartup = Components.interfaces.nsIProfileStartup;
const kProfileMigratorContractIDPrefix = "@mozilla.org/profile/migrator;1?app=mail&type=";
const nsISupportsString = Components.interfaces.nsISupportsString;
var MigrationWizard = {
_source: "", // Source Profile Migrator ContractID suffix
--- a/mail/components/migration/jar.mn
+++ b/mail/components/migration/jar.mn
@@ -1,7 +1,7 @@
# 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/.
messenger.jar:
* content/messenger/migration/migration.xul (content/migration.xul)
-* content/messenger/migration/migration.js (content/migration.js)
+ content/messenger/migration/migration.js (content/migration.js)
--- a/mail/components/preferences/actionsshared.js
+++ b/mail/components/preferences/actionsshared.js
@@ -1,12 +1,12 @@
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+/* -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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/. */
const FILEACTION_SAVE_TO_DISK = 1;
const FILEACTION_OPEN_INTERNALLY = 2;
const FILEACTION_OPEN_DEFAULT = 3;
const FILEACTION_OPEN_CUSTOM = 4;
const FILEACTION_OPEN_PLUGIN = 5;
function FileAction ()
{
--- a/mail/components/preferences/applicationManager.js
+++ b/mail/components/preferences/applicationManager.js
@@ -1,11 +1,11 @@
-# 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/.
+/* 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 gAppManagerDialog = {
_removed: [],
init: function appManager_init() {
this.handlerInfo = window.arguments[0];
var bundle = document.getElementById("appManagerBundle");
--- a/mail/components/preferences/applicationManager.xul
+++ b/mail/components/preferences/applicationManager.xul
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
-# 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/.
+<!-- 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/. -->
<?xml-stylesheet href="chrome://global/skin/"?>
<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/preferences/applicationManager.dtd">
<dialog id="appManager"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
buttons="accept,cancel"
--- a/mail/components/preferences/attachmentReminder.js
+++ b/mail/components/preferences/attachmentReminder.js
@@ -1,10 +1,10 @@
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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 gAttachmentReminderOptionsDialog = {
prefs: null,
promptService: null,
keywordListBox: null,
bundle: null,
--- a/mail/components/preferences/attachmentReminder.xul
+++ b/mail/components/preferences/attachmentReminder.xul
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# 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/.
+<!-- -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ - 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/. -->
<?xml-stylesheet href="chrome://global/skin/"?>
<!DOCTYPE prefwindow [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
%brandDTD;
<!ENTITY % sendOptionsDTD SYSTEM "chrome://messenger/locale/preferences/attachmentReminder.dtd">
%sendOptionsDTD;
]>
--- a/mail/components/preferences/chat.xul
+++ b/mail/components/preferences/chat.xul
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ - 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/. -->
<!DOCTYPE overlay [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
<!ENTITY % chatDTD SYSTEM "chrome://messenger/locale/preferences/chat.dtd">
%brandDTD;
%chatDTD;
]>
--- a/mail/components/preferences/compose.js
+++ b/mail/components/preferences/compose.js
@@ -1,12 +1,12 @@
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+/* -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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 gComposePane = {
mInitialized: false,
mSpellChecker: null,
mDictCount : 0,
init: function ()
{
--- a/mail/components/preferences/compose.xul
+++ b/mail/components/preferences/compose.xul
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+<!-- -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ - 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/. -->
<!DOCTYPE overlay [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
<!ENTITY % composeDTD SYSTEM "chrome://messenger/locale/preferences/compose.dtd">
<!ENTITY % editorOverlayDTD SYSTEM "chrome://editor/locale/editorOverlay.dtd">
%brandDTD;
%composeDTD;
%editorOverlayDTD;
--- a/mail/components/preferences/connection.js
+++ b/mail/components/preferences/connection.js
@@ -1,12 +1,12 @@
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+/* -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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 gConnectionsDialog = {
beforeAccept: function ()
{
var proxyTypePref = document.getElementById("network.proxy.type");
if (proxyTypePref.value == 2) {
this.doAutoconfigURLFixup();
return true;
--- a/mail/components/preferences/connection.xul
+++ b/mail/components/preferences/connection.xul
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+<!-- -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ - 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/. -->
<!DOCTYPE prefwindow SYSTEM "chrome://messenger/locale/preferences/connection.dtd">
<?xml-stylesheet href="chrome://global/skin/"?>
<prefwindow id="ConnectionsDialog" type="child"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&connectionsDialog.title;"
--- a/mail/components/preferences/cookies.js
+++ b/mail/components/preferences/cookies.js
@@ -1,12 +1,12 @@
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+/* -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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/. */
const nsICookie = Components.interfaces.nsICookie;
var gCookiesWindow = {
_cm : Components.classes["@mozilla.org/cookiemanager;1"]
.getService(Components.interfaces.nsICookieManager),
_ds : Components.classes["@mozilla.org/intl/scriptabledateformat;1"]
.getService(Components.interfaces.nsIScriptableDateFormat),
@@ -582,65 +582,65 @@ var gCookiesWindow = {
document.getElementById("removeCookie").label = this._bundle.getString(stringKey);
document.getElementById("removeAllCookies").disabled = this._view._filtered;
document.getElementById("removeCookie").disabled = !(seln.count > 0);
},
deleteCookie: function ()
{
-# // Selection Notes
-# // - Selection always moves to *NEXT* adjacent item unless item
-# // is last child at a given level in which case it moves to *PREVIOUS*
-# // item
-# //
-# // Selection Cases (Somewhat Complicated)
-# //
-# // 1) Single cookie selected, host has single child
-# // v cnn.com
-# // //// cnn.com ///////////// goksdjf@ ////
-# // > atwola.com
-# //
-# // Before SelectedIndex: 1 Before RowCount: 3
-# // After SelectedIndex: 0 After RowCount: 1
-# //
-# // 2) Host selected, host open
-# // v goats.com ////////////////////////////
-# // goats.com sldkkfjl
-# // goat.scom flksj133
-# // > atwola.com
-# //
-# // Before SelectedIndex: 0 Before RowCount: 4
-# // After SelectedIndex: 0 After RowCount: 1
-# //
-# // 3) Host selected, host closed
-# // > goats.com ////////////////////////////
-# // > atwola.com
-# //
-# // Before SelectedIndex: 0 Before RowCount: 2
-# // After SelectedIndex: 0 After RowCount: 1
-# //
-# // 4) Single cookie selected, host has many children
-# // v goats.com
-# // goats.com sldkkfjl
-# // //// goats.com /////////// flksjl33 ////
-# // > atwola.com
-# //
-# // Before SelectedIndex: 2 Before RowCount: 4
-# // After SelectedIndex: 1 After RowCount: 3
-# //
-# // 5) Single cookie selected, host has many children
-# // v goats.com
-# // //// goats.com /////////// flksjl33 ////
-# // goats.com sldkkfjl
-# // > atwola.com
-# //
-# // Before SelectedIndex: 1 Before RowCount: 4
-# // After SelectedIndex: 1 After RowCount: 3
- var seln = this._view.selection;
+ // Selection Notes
+ // - Selection always moves to *NEXT* adjacent item unless item
+ // is last child at a given level in which case it moves to *PREVIOUS*
+ // item
+ //
+ // Selection Cases (Somewhat Complicated)
+ //
+ // 1) Single cookie selected, host has single child
+ // v cnn.com
+ // //// cnn.com ///////////// goksdjf@ ////
+ // > atwola.com
+ //
+ // Before SelectedIndex: 1 Before RowCount: 3
+ // After SelectedIndex: 0 After RowCount: 1
+ //
+ // 2) Host selected, host open
+ // v goats.com ////////////////////////////
+ // goats.com sldkkfjl
+ // goat.scom flksj133
+ // > atwola.com
+ //
+ // Before SelectedIndex: 0 Before RowCount: 4
+ // After SelectedIndex: 0 After RowCount: 1
+ //
+ // 3) Host selected, host closed
+ // > goats.com ////////////////////////////
+ // > atwola.com
+ //
+ // Before SelectedIndex: 0 Before RowCount: 2
+ // After SelectedIndex: 0 After RowCount: 1
+ //
+ // 4) Single cookie selected, host has many children
+ // v goats.com
+ // goats.com sldkkfjl
+ // //// goats.com /////////// flksjl33 ////
+ // > atwola.com
+ //
+ // Before SelectedIndex: 2 Before RowCount: 4
+ // After SelectedIndex: 1 After RowCount: 3
+ //
+ // 5) Single cookie selected, host has many children
+ // v goats.com
+ // //// goats.com /////////// flksjl33 ////
+ // goats.com sldkkfjl
+ // > atwola.com
+ //
+ // Before SelectedIndex: 1 Before RowCount: 4
+ // After SelectedIndex: 1 After RowCount: 3
+
var tbo = this._tree.treeBoxObject;
if (seln.count < 1) return;
var nextSelected = 0;
var rowCountImpact = 0;
var deleteItems = [];
if (!this._view._filtered) {
--- a/mail/components/preferences/general.js
+++ b/mail/components/preferences/general.js
@@ -1,12 +1,12 @@
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+/* -*- Mode: JavaScript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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 gGeneralPane = {
mPane: null,
mStartPageUrl: "",
init: function ()
{
this.mPane = document.getElementById("paneGeneral");
--- a/mail/components/preferences/jar.mn
+++ b/mail/components/preferences/jar.mn
@@ -1,45 +1,45 @@
# 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/.
messenger.jar:
* content/messenger/preferences/preferences.xul
content/messenger/preferences/preferences.js
* content/messenger/preferences/general.xul
-* content/messenger/preferences/general.js
-* content/messenger/preferences/display.xul
+ content/messenger/preferences/general.js
+ content/messenger/preferences/display.xul
content/messenger/preferences/display.js
-* content/messenger/preferences/chat.xul
+ content/messenger/preferences/chat.xul
content/messenger/preferences/chat.js
-* content/messenger/preferences/compose.xul
-* content/messenger/preferences/compose.js
+ content/messenger/preferences/compose.xul
+ content/messenger/preferences/compose.js
* content/messenger/preferences/sendoptions.xul
-* content/messenger/preferences/sendoptions.js
-* content/messenger/preferences/security.xul
-* content/messenger/preferences/security.js
-* content/messenger/preferences/junkLog.xul
-* content/messenger/preferences/junkLog.js
+ content/messenger/preferences/sendoptions.js
+ content/messenger/preferences/security.xul
+ content/messenger/preferences/security.js
+ content/messenger/preferences/junkLog.xul
+ content/messenger/preferences/junkLog.js
* content/messenger/preferences/advanced.js
* content/messenger/preferences/advanced.xul
* content/messenger/preferences/receipts.xul
-* content/messenger/preferences/connection.js
-* content/messenger/preferences/connection.xul
+ content/messenger/preferences/connection.js
+ content/messenger/preferences/connection.xul
* content/messenger/preferences/downloads.js
-* content/messenger/preferences/attachmentReminder.js
-* content/messenger/preferences/attachmentReminder.xul
+ content/messenger/preferences/attachmentReminder.js
+ content/messenger/preferences/attachmentReminder.xul
* content/messenger/preferences/applications.xul
* content/messenger/preferences/applications.js
-* content/messenger/preferences/applicationManager.xul
-* content/messenger/preferences/applicationManager.js
-* content/messenger/preferences/handlers.xml
-* content/messenger/preferences/handlers.css
-* content/messenger/preferences/actionsshared.js
+ content/messenger/preferences/applicationManager.xul
+ content/messenger/preferences/applicationManager.js
+ content/messenger/preferences/handlers.xml
+ content/messenger/preferences/handlers.css
+ content/messenger/preferences/actionsshared.js
content/messenger/preferences/fonts.js
* content/messenger/preferences/fonts.xul
-* content/messenger/preferences/notifications.xul
-* content/messenger/preferences/offline.xul
-* content/messenger/preferences/cookies.js
+ content/messenger/preferences/notifications.xul
+ content/messenger/preferences/offline.xul
+ content/messenger/preferences/cookies.js
* content/messenger/preferences/cookies.xul
-* content/messenger/preferences/permissions.js
+ content/messenger/preferences/permissions.js
* content/messenger/preferences/permissions.xul
-* content/messenger/preferences/permissionsutils.js
+ content/messenger/preferences/permissionsutils.js
--- a/mail/components/preferences/junkLog.js
+++ b/mail/components/preferences/junkLog.js
@@ -1,12 +1,12 @@
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+/* -*- Mode: JavaScript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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 gLogView;
var gLogFile;
function onLoad()
{
gLogView = document.getElementById("logView");
gLogView.docShell.allowJavascript = false; // for security, disable JS
--- a/mail/components/preferences/junkLog.xul
+++ b/mail/components/preferences/junkLog.xul
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+<!-- -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ - 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/. -->
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/preferences/junkLog.dtd">
<dialog id="viewLogWindow"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="onLoad();"
--- a/mail/components/preferences/notifications.xul
+++ b/mail/components/preferences/notifications.xul
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+<!-- -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ - 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/. -->
<?xml-stylesheet href="chrome://global/skin/"?>
<?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
<?xml-stylesheet href="chrome://mozapps/content/preferences/preferences.css"?>
<!DOCTYPE prefwindow [
<!ENTITY % notificationsDTD SYSTEM "chrome://messenger/locale/preferences/notifications.dtd">
%notificationsDTD;
--- a/mail/components/preferences/offline.xul
+++ b/mail/components/preferences/offline.xul
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+<!-- -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ - 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/. -->
<?xml-stylesheet href="chrome://global/skin/"?>
<?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
<?xml-stylesheet href="chrome://mozapps/content/preferences/preferences.css"?>
<!DOCTYPE prefwindow [
<!ENTITY % offlineDTD SYSTEM "chrome://messenger/locale/preferences/offline.dtd">
%offlineDTD;
--- a/mail/components/preferences/permissions.js
+++ b/mail/components/preferences/permissions.js
@@ -1,11 +1,11 @@
-# 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/.
+/* 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/. */
const nsIPermissionManager = Components.interfaces.nsIPermissionManager;
const nsICookiePermission = Components.interfaces.nsICookiePermission;
function Permission(host, rawHost, type, capability, perm)
{
this.host = host;
this.rawHost = rawHost;
--- a/mail/components/preferences/permissionsutils.js
+++ b/mail/components/preferences/permissionsutils.js
@@ -1,12 +1,12 @@
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+/* -*- Mode: JavaScript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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 gTreeUtils = {
deleteAll: function (aTree, aView, aItems, aDeletedItems)
{
for (var i = 0; i < aItems.length; ++i)
aDeletedItems.push(aItems[i]);
aItems.splice(0);
var oldCount = aView.rowCount;
--- a/mail/components/preferences/security.js
+++ b/mail/components/preferences/security.js
@@ -1,12 +1,12 @@
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+/* -*- Mode: JavaScript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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 gSecurityPane = {
mPane: null,
mInitialized: false,
init: function ()
{
this.mPane = document.getElementById("paneSecurity");
--- a/mail/components/preferences/security.xul
+++ b/mail/components/preferences/security.xul
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+<!-- -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ - 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/. -->
<!DOCTYPE overlay [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
<!ENTITY % securityDTD SYSTEM "chrome://messenger/locale/preferences/security.dtd">
%brandDTD;
%securityDTD;
]>
--- a/mail/components/preferences/sendoptions.js
+++ b/mail/components/preferences/sendoptions.js
@@ -1,12 +1,12 @@
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+/* -*- Mode: JavaScript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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 gSendOptionsDialog = {
mPrefsBundle: null,
mHTMLListBox: null,
mPlainTextListBox: null,
init: function ()
{
--- a/mail/components/search/jar.mn
+++ b/mail/components/search/jar.mn
@@ -1,8 +1,8 @@
# 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/.
messenger.jar:
% overlay chrome://messenger/content/messenger.xul chrome://messenger/content/search/searchOverlay.xul
content/messenger/search/searchOverlay.xul (content/searchOverlay.xul)
-* content/messenger/search/searchOverlay.js (content/searchOverlay.js)
+ content/messenger/search/searchOverlay.js (content/searchOverlay.js)
--- a/mail/extensions/smime/content/msgCompSMIMEOverlay.xul
+++ b/mail/extensions/smime/content/msgCompSMIMEOverlay.xul
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-# 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/.
+<!-- 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/. -->
<?xml-stylesheet href="chrome://messenger/skin/smime/msgCompSMIMEOverlay.css" type="text/css"?>
<!DOCTYPE overlay SYSTEM "chrome://messenger-smime/locale/msgCompSMIMEOverlay.dtd">
<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" src="chrome://messenger-smime/content/msgCompSMIMEOverlay.js"/>
--- a/mail/extensions/smime/content/msgHdrViewSMIMEOverlay.js
+++ b/mail/extensions/smime/content/msgHdrViewSMIMEOverlay.js
@@ -1,12 +1,12 @@
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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/.
+/* -*- Mode: JavaScript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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 gSignedUINode = null;
var gEncryptedUINode = null;
var gSMIMEContainer = null;
var gStatusBar = null;
var gEncryptedURIService = null;
var gMyLastEncryptedURI = null;
--- a/mail/extensions/smime/content/msgReadSMIMEOverlay.xul
+++ b/mail/extensions/smime/content/msgReadSMIMEOverlay.xul
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-# 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/.
+<!-- 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/. -->
<?xml-stylesheet href="chrome://messenger/skin/smime/msgReadSMIMEOverlay.css" type="text/css"?>
<!DOCTYPE overlay SYSTEM "chrome://messenger-smime/locale/msgReadSMIMEOverlay.dtd">
<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
--- a/mail/extensions/smime/jar.mn
+++ b/mail/extensions/smime/jar.mn
@@ -4,20 +4,20 @@
messenger.jar:
% content messenger-smime %content/messenger-smime/
% overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://messenger-smime/content/msgCompSMIMEOverlay.xul
% overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://messenger-smime/content/msgHdrViewSMIMEOverlay.xul
% overlay chrome://messenger/content/messenger.xul chrome://messenger-smime/content/msgReadSMIMEOverlay.xul
% overlay chrome://messenger/content/messageWindow.xul chrome://messenger-smime/content/msgReadSMIMEOverlay.xul
% overlay chrome://messenger/content/am-identity-edit.xul chrome://messenger/content/am-smimeIdentityEditOverlay.xul
-* content/messenger-smime/msgReadSMIMEOverlay.xul (content/msgReadSMIMEOverlay.xul)
-* content/messenger-smime/msgCompSMIMEOverlay.xul (content/msgCompSMIMEOverlay.xul)
-* content/messenger-smime/msgCompSMIMEOverlay.js (content/msgCompSMIMEOverlay.js)
-* content/messenger-smime/msgHdrViewSMIMEOverlay.js (content/msgHdrViewSMIMEOverlay.js)
+ content/messenger-smime/msgReadSMIMEOverlay.xul (content/msgReadSMIMEOverlay.xul)
+ content/messenger-smime/msgCompSMIMEOverlay.xul (content/msgCompSMIMEOverlay.xul)
+ content/messenger-smime/msgCompSMIMEOverlay.js (content/msgCompSMIMEOverlay.js)
+ content/messenger-smime/msgHdrViewSMIMEOverlay.js (content/msgHdrViewSMIMEOverlay.js)
content/messenger-smime/msgHdrViewSMIMEOverlay.xul (content/msgHdrViewSMIMEOverlay.xul)
content/messenger/am-smime.xul (/mailnews/extensions/smime/content/am-smime.xul)
content/messenger/am-smime.js (/mailnews/extensions/smime/content/am-smime.js)
content/messenger/am-smimeIdentityEditOverlay.xul (/mailnews/extensions/smime/content/am-smimeIdentityEditOverlay.xul)
content/messenger/am-smimeOverlay.xul (/mailnews/extensions/smime/content/am-smimeOverlay.xul)
content/messenger-smime/msgReadSMIMEOverlay.js (/mailnews/extensions/smime/content/msgReadSMIMEOverlay.js)
content/messenger-smime/msgCompSecurityInfo.js (/mailnews/extensions/smime/content/msgCompSecurityInfo.js)
content/messenger-smime/msgCompSecurityInfo.xul (/mailnews/extensions/smime/content/msgCompSecurityInfo.xul)
--- a/mail/themes/qute/jar.mn
+++ b/mail/themes/qute/jar.mn
@@ -282,17 +282,17 @@ classic.jar:
skin/classic/aero/communicator/icons/smileys/smiley-yell.png (mail/icons/smiley-yell-aero.png)
skin/classic/aero/communicator/icons/smileys/smiley-cool.png (mail/icons/smiley-cool-aero.png)
skin/classic/aero/communicator/icons/smileys/smiley-money-mouth.png (mail/icons/smiley-money-mouth-aero.png)
skin/classic/aero/communicator/icons/smileys/smiley-foot-in-mouth.png (mail/icons/smiley-foot-in-mouth-aero.png)
skin/classic/aero/communicator/icons/smileys/smiley-innocent.png (mail/icons/smiley-innocent-aero.png)
skin/classic/aero/communicator/icons/smileys/smiley-cry.png (mail/icons/smiley-cry-aero.png)
skin/classic/aero/communicator/icons/smileys/smiley-sealed.png (mail/icons/smiley-sealed-aero.png)
% skin messenger classic/1.0 %skin/classic/aero/messenger/ os=WINNT osversion>=6
-* skin/classic/aero/messenger/primaryToolbar.css (mail/primaryToolbar-aero.css)
+ skin/classic/aero/messenger/primaryToolbar.css (mail/primaryToolbar-aero.css)
skin/classic/aero/messenger/aboutSupport.css (mail/aboutSupport.css)
skin/classic/aero/messenger/accountCentral.css (mail/accountCentral.css)
skin/classic/aero/messenger/accountCreation.css (mail/accountCreation.css)
skin/classic/aero/messenger/accountManage.css (mail/accountManage.css)
skin/classic/aero/messenger/accountWizard.css (mail/accountWizard.css)
* skin/classic/aero/messenger/chat.css (mail/chat-aero.css)
skin/classic/aero/messenger/userIcon.png (mail/userIcon.png)
* skin/classic/aero/messenger/imAccounts.css (../../components/im/themes/imAccounts.css)
@@ -303,17 +303,17 @@ classic.jar:
skin/classic/aero/messenger/imStatus.css (../../components/im/themes/imStatus.css)
skin/classic/aero/messenger/founder.png (../../components/im/themes/founder.png)
skin/classic/aero/messenger/operator.png (../../components/im/themes/operator.png)
skin/classic/aero/messenger/half-operator.png (../../components/im/themes/half-operator.png)
skin/classic/aero/messenger/voice.png (../../components/im/themes/voice.png)
* skin/classic/aero/messenger/browserRequest.css (mail/browserRequest-aero.css)
skin/classic/aero/messenger/section_collapsed.png (mail/section_collapsed.png)
skin/classic/aero/messenger/section_expanded.png (mail/section_expanded.png)
-* skin/classic/aero/messenger/messageHeader.css (mail/messageHeader-aero.css)
+ skin/classic/aero/messenger/messageHeader.css (mail/messageHeader-aero.css)
skin/classic/aero/messenger/messageBody.css (mail/messageBody.css)
skin/classic/aero/messenger/webSearch.css (mail/webSearch-aero.css)
skin/classic/aero/messenger/messageQuotes.css (mail/messageQuotes.css)
* skin/classic/aero/messenger/messenger.css (mail/messenger-aero.css)
skin/classic/aero/messenger/attachmentList.css (mail/attachmentList.css)
skin/classic/aero/messenger/imageFilters.svg (mail/imageFilters.svg)
* skin/classic/aero/messenger/mailWindow1.css (mail/mailWindow1-aero.css)
* skin/classic/aero/messenger/tagColors.css (mail/tagColors-aero.css)
--- a/other-licenses/branding/thunderbird/jar.mn
+++ b/other-licenses/branding/thunderbird/jar.mn
@@ -1,9 +1,9 @@
messenger.jar:
% content branding %content/branding/
content/branding/about-background.png (content/about-background.png)
content/branding/about-logo.png (content/about-logo.png)
content/branding/about-wordmark.png (content/about-wordmark.png)
content/branding/about.png (content/about.png)
content/branding/icon48.png (content/icon48.png)
content/branding/icon64.png (content/icon64.png)
-* content/branding/aboutDialog.css (content/aboutDialog.css)
+ content/branding/aboutDialog.css (content/aboutDialog.css)
