From 99f84f4bee1dba604c1b319bd313f0d004d7d1a0 Mon Sep 17 00:00:00 2001 From: Taras Glek Date: Thu, 6 Aug 2009 17:20:44 -0700 Subject: [PATCH] Backed out changeset e6d6596ef49a --- browser/installer/removed-files.in | 4 ---- browser/themes/gnomestripe/browser/jar.mn | 2 +- browser/themes/gnomestripe/communicator/jar.mn | 2 +- browser/themes/pinstripe/browser/jar.mn | 2 +- browser/themes/pinstripe/communicator/jar.mn | 2 +- browser/themes/winstripe/browser/jar.mn | 4 ++-- browser/themes/winstripe/communicator/jar.mn | 2 +- extensions/reporter/jar.mn | 2 +- toolkit/profile/skin/jar.mn | 2 +- toolkit/themes/faststripe/global/jar.mn | 2 +- toolkit/themes/gnomestripe/global/jar.mn | 2 +- toolkit/themes/gnomestripe/help/jar.mn | 2 +- toolkit/themes/gnomestripe/mozapps/jar.mn | 2 +- toolkit/themes/pinstripe/global/jar.mn | 2 +- toolkit/themes/pinstripe/help/jar.mn | 2 +- toolkit/themes/pinstripe/mozapps/jar.mn | 2 +- toolkit/themes/pmstripe/global/jar.mn | 2 +- toolkit/themes/winstripe/global/jar.mn | 4 ++-- toolkit/themes/winstripe/help/jar.mn | 2 +- toolkit/themes/winstripe/mozapps/jar.mn | 4 ++-- 20 files changed, 22 insertions(+), 26 deletions(-) diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in index adeed7210cc0..20cae0f5e163 100644 --- a/browser/installer/removed-files.in +++ b/browser/installer/removed-files.in @@ -1,7 +1,3 @@ -chrome/classic.jar -chrome/classic.manifest -chrome/reporter.jar -chrome/reporter.manifest chrome/US.jar chrome/en-win.jar chrome/help.jar diff --git a/browser/themes/gnomestripe/browser/jar.mn b/browser/themes/gnomestripe/browser/jar.mn index 834fefd3ad28..1cb5af9ce395 100644 --- a/browser/themes/gnomestripe/browser/jar.mn +++ b/browser/themes/gnomestripe/browser/jar.mn @@ -1,4 +1,4 @@ -browser.jar: +classic.jar: % skin browser classic/1.0 %skin/classic/browser/ % override chrome://global/skin/icons/warning-16.png moz-icon://stock/gtk-dialog-warning?size=menu skin/classic/browser/sanitizeDialog.css (sanitizeDialog.css) diff --git a/browser/themes/gnomestripe/communicator/jar.mn b/browser/themes/gnomestripe/communicator/jar.mn index cdecb37eca40..ac8a7eace29a 100644 --- a/browser/themes/gnomestripe/communicator/jar.mn +++ b/browser/themes/gnomestripe/communicator/jar.mn @@ -1,3 +1,3 @@ -browser.jar: +classic.jar: % skin communicator classic/1.0 %skin/classic/communicator/ skin/classic/communicator/communicator.css diff --git a/browser/themes/pinstripe/browser/jar.mn b/browser/themes/pinstripe/browser/jar.mn index d8f2354616c3..d7e45212790a 100644 --- a/browser/themes/pinstripe/browser/jar.mn +++ b/browser/themes/pinstripe/browser/jar.mn @@ -1,4 +1,4 @@ -browser.jar: +classic.jar: % skin browser classic/1.0 %skin/classic/browser/ skin/classic/browser/sanitizeDialog.css (sanitizeDialog.css) * skin/classic/browser/aboutPrivateBrowsing.css (aboutPrivateBrowsing.css) diff --git a/browser/themes/pinstripe/communicator/jar.mn b/browser/themes/pinstripe/communicator/jar.mn index cdecb37eca40..ac8a7eace29a 100644 --- a/browser/themes/pinstripe/communicator/jar.mn +++ b/browser/themes/pinstripe/communicator/jar.mn @@ -1,3 +1,3 @@ -browser.jar: +classic.jar: % skin communicator classic/1.0 %skin/classic/communicator/ skin/classic/communicator/communicator.css diff --git a/browser/themes/winstripe/browser/jar.mn b/browser/themes/winstripe/browser/jar.mn index 84f3882b9d12..24a5a0576801 100644 --- a/browser/themes/winstripe/browser/jar.mn +++ b/browser/themes/winstripe/browser/jar.mn @@ -1,4 +1,4 @@ -browser.jar: +classic.jar: % skin browser classic/1.0 %skin/classic/browser/ os=WINNT osversion<6 % skin browser classic/1.0 %skin/classic/browser/ os!=WINNT # NOTE: If you add a new file here, you'll need to add it to the aero @@ -94,7 +94,7 @@ browser.jar: preview.png #ifdef XP_WIN -browser.jar: +classic.jar: % skin browser classic/1.0 %skin/classic/aero/browser/ os=WINNT osversion>=6 skin/classic/aero/browser/sanitizeDialog.css (sanitizeDialog.css) * skin/classic/aero/browser/aboutPrivateBrowsing.css (aboutPrivateBrowsing.css) diff --git a/browser/themes/winstripe/communicator/jar.mn b/browser/themes/winstripe/communicator/jar.mn index cdecb37eca40..ac8a7eace29a 100644 --- a/browser/themes/winstripe/communicator/jar.mn +++ b/browser/themes/winstripe/communicator/jar.mn @@ -1,3 +1,3 @@ -browser.jar: +classic.jar: % skin communicator classic/1.0 %skin/classic/communicator/ skin/classic/communicator/communicator.css diff --git a/extensions/reporter/jar.mn b/extensions/reporter/jar.mn index 71d1eaaf0be7..2bfc32b5eb8d 100644 --- a/extensions/reporter/jar.mn +++ b/extensions/reporter/jar.mn @@ -1,4 +1,4 @@ -browser.jar: +reporter.jar: % content reporter %content/reporter/ xpcnativewrappers=yes % overlay chrome://browser/content/browser.xul chrome://reporter/content/reporterOverlay.xul % overlay chrome://navigator/content/navigator.xul chrome://reporter/content/reporterOverlay.xul diff --git a/toolkit/profile/skin/jar.mn b/toolkit/profile/skin/jar.mn index 2af27c99e455..2fa34eb2c46f 100644 --- a/toolkit/profile/skin/jar.mn +++ b/toolkit/profile/skin/jar.mn @@ -1,3 +1,3 @@ -toolkit.jar: +classic.jar: skin/classic/mozapps/profile/profileSelection.css skin/classic/mozapps/profile/profileicon.png diff --git a/toolkit/themes/faststripe/global/jar.mn b/toolkit/themes/faststripe/global/jar.mn index fc51ef5ea158..8ca0902213de 100644 --- a/toolkit/themes/faststripe/global/jar.mn +++ b/toolkit/themes/faststripe/global/jar.mn @@ -1,4 +1,4 @@ -toolkit.jar: +classic.jar: % skin global classic/1.0 %skin/classic/global/ # These are the CSS files that have been changed from winstripe + skin/classic/global/button.css diff --git a/toolkit/themes/gnomestripe/global/jar.mn b/toolkit/themes/gnomestripe/global/jar.mn index 1fa1e0b8a5ae..479344a03940 100644 --- a/toolkit/themes/gnomestripe/global/jar.mn +++ b/toolkit/themes/gnomestripe/global/jar.mn @@ -1,4 +1,4 @@ -toolkit.jar: +classic.jar: + skin/classic/global/autocomplete.css + skin/classic/global/popup.css + skin/classic/global/menu.css diff --git a/toolkit/themes/gnomestripe/help/jar.mn b/toolkit/themes/gnomestripe/help/jar.mn index 46c2cd4c3e19..b9495502516b 100644 --- a/toolkit/themes/gnomestripe/help/jar.mn +++ b/toolkit/themes/gnomestripe/help/jar.mn @@ -1,2 +1,2 @@ -toolkit.jar: +classic.jar: + skin/classic/help/help.css diff --git a/toolkit/themes/gnomestripe/mozapps/jar.mn b/toolkit/themes/gnomestripe/mozapps/jar.mn index b1dfa5dd9280..faaef19985b0 100644 --- a/toolkit/themes/gnomestripe/mozapps/jar.mn +++ b/toolkit/themes/gnomestripe/mozapps/jar.mn @@ -1,4 +1,4 @@ -toolkit.jar: +classic.jar: + skin/classic/mozapps/update/update.png (update/update.png) + skin/classic/mozapps/update/updates.css (update/updates.css) + skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png) diff --git a/toolkit/themes/pinstripe/global/jar.mn b/toolkit/themes/pinstripe/global/jar.mn index 524c52c968af..ba6753980b55 100644 --- a/toolkit/themes/pinstripe/global/jar.mn +++ b/toolkit/themes/pinstripe/global/jar.mn @@ -1,4 +1,4 @@ -toolkit.jar: +classic.jar: % skin global classic/1.0 %skin/classic/global/ + skin/classic/global/10pct_transparent_grey.png + skin/classic/global/20pct_transparent_pixel.png diff --git a/toolkit/themes/pinstripe/help/jar.mn b/toolkit/themes/pinstripe/help/jar.mn index 8ae79a8dfcc5..e7e04f8d2c80 100644 --- a/toolkit/themes/pinstripe/help/jar.mn +++ b/toolkit/themes/pinstripe/help/jar.mn @@ -1,4 +1,4 @@ -toolkit.jar: +classic.jar: % skin help classic/1.0 %skin/classic/help/ skin/classic/help/help.css skin/classic/help/Toolbar.png diff --git a/toolkit/themes/pinstripe/mozapps/jar.mn b/toolkit/themes/pinstripe/mozapps/jar.mn index 3c8e67a1e836..b72c0286fae9 100644 --- a/toolkit/themes/pinstripe/mozapps/jar.mn +++ b/toolkit/themes/pinstripe/mozapps/jar.mn @@ -1,4 +1,4 @@ -toolkit.jar: +classic.jar: % skin mozapps classic/1.0 %skin/classic/mozapps/ skin/classic/mozapps/downloads/buttons.png (downloads/buttons.png) skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png) diff --git a/toolkit/themes/pmstripe/global/jar.mn b/toolkit/themes/pmstripe/global/jar.mn index 4b9d9246f465..de529e453e10 100644 --- a/toolkit/themes/pmstripe/global/jar.mn +++ b/toolkit/themes/pmstripe/global/jar.mn @@ -1,4 +1,4 @@ -toolkit.jar: +classic.jar: + skin/classic/global/popup.css + skin/classic/global/menu.css + skin/classic/global/toolbar.css diff --git a/toolkit/themes/winstripe/global/jar.mn b/toolkit/themes/winstripe/global/jar.mn index a752036561ae..51f50d393e0e 100644 --- a/toolkit/themes/winstripe/global/jar.mn +++ b/toolkit/themes/winstripe/global/jar.mn @@ -1,4 +1,4 @@ -toolkit.jar: +classic.jar: % skin global classic/1.0 %skin/classic/global/ os=WINNT osversion<6 % skin global classic/1.0 %skin/classic/global/ os!=WINNT # NOTE: If you add a new file here, you'll need to add it to the aero @@ -163,7 +163,7 @@ toolkit.jar: skin/classic/global/tree/twisty-open.png (tree/twisty-open.png) #ifdef XP_WIN -toolkit.jar: +classic.jar: % skin global classic/1.0 %skin/classic/aero/global/ os=WINNT osversion>=6 skin/classic/aero/global/about.css skin/classic/aero/global/appPicker.css diff --git a/toolkit/themes/winstripe/help/jar.mn b/toolkit/themes/winstripe/help/jar.mn index 50ffdb520588..a60ab3d7aa6d 100644 --- a/toolkit/themes/winstripe/help/jar.mn +++ b/toolkit/themes/winstripe/help/jar.mn @@ -1,4 +1,4 @@ -toolkit.jar: +classic.jar: % skin help classic/1.0 %skin/classic/help/ skin/classic/help/help.css skin/classic/help/Toolbar.png diff --git a/toolkit/themes/winstripe/mozapps/jar.mn b/toolkit/themes/winstripe/mozapps/jar.mn index 1b52176d15ab..c58895d3b742 100644 --- a/toolkit/themes/winstripe/mozapps/jar.mn +++ b/toolkit/themes/winstripe/mozapps/jar.mn @@ -1,4 +1,4 @@ -toolkit.jar: +classic.jar: % skin mozapps classic/1.0 %skin/classic/mozapps/ os=WINNT osversion<6 % skin mozapps classic/1.0 %skin/classic/mozapps/ os!=WINNT # NOTE: If you add a new file here, you'll need to add it to the aero @@ -42,7 +42,7 @@ toolkit.jar: skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png (xpinstall/xpinstallItemGeneric.png) #ifdef XP_WIN -toolkit.jar: +classic.jar: % skin mozapps classic/1.0 %skin/classic/aero/mozapps/ os=WINNT osversion>=6 skin/classic/aero/mozapps/downloads/downloadButtons.png (downloads/downloadButtons-aero.png) skin/classic/aero/mozapps/downloads/downloadIcon.png (downloads/downloadIcon-aero.png)