Bug 295235 - remove remaining contents.rdf chrome registration from Firefox and Thunderbird, r=mconnor a=asa
This commit is contained in:
bsmedberg%covad.net
Родитель
e21aeb477a
Коммит
081488379d
|
|
@ -892,6 +892,7 @@ browser/components/bookmarks/Makefile
|
|||
browser/components/bookmarks/public/Makefile
|
||||
browser/components/bookmarks/src/Makefile
|
||||
browser/components/build/Makefile
|
||||
browser/components/dirprovider/Makefile
|
||||
browser/components/history/Makefile
|
||||
browser/components/migration/Makefile
|
||||
browser/components/migration/public/Makefile
|
||||
|
|
@ -1021,7 +1022,6 @@ toolkit/themes/winstripe/help/Makefile
|
|||
toolkit/themes/winstripe/mozapps/Makefile
|
||||
toolkit/xre/Makefile
|
||||
toolkit/components/passwordmgr/resources/content/contents.rdf
|
||||
toolkit/mozapps/contents-content.rdf
|
||||
"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -89,12 +89,6 @@ if (verifyDiskSpace(communicatorFolder, srDest))
|
|||
var ignoreErr = dirCreate(pluginsFolder);
|
||||
logComment("dirCreate() returned: " + ignoreErr);
|
||||
|
||||
// register chrome
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome", "classic.jar"), "skin/classic/browser/");
|
||||
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/autoconfig/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/wallet/");
|
||||
|
||||
if (err==SUCCESS)
|
||||
{
|
||||
err = performInstall();
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
var err = initInstall("Website Reporter", "Reporter", "$Version$");
|
||||
logComment("initInstall: " + err);
|
||||
|
||||
addDirectory("", "$Version$", "bin", getFolder("Program"), "", true);
|
||||
|
||||
var jarFolder = getFolder("Chrome", "reporter.jar");
|
||||
|
||||
registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/classic/reporter/");
|
||||
|
||||
err = getLastError();
|
||||
if (err==SUCCESS)
|
||||
performInstall();
|
||||
else
|
||||
cancelInstall(err);
|
||||
|
||||
|
|
@ -524,12 +524,6 @@ if(verifyDiskSpace(fProgram, srDest))
|
|||
// we don't want to fail on errors for the above two
|
||||
resetError();
|
||||
|
||||
// register chrome. Most chrome is in .manifest files now, as we migrate
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome", "classic.jar"), "skin/classic/browser/");
|
||||
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/autoconfig/");
|
||||
registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/wallet/");
|
||||
|
||||
// Create the uninstall folder.
|
||||
err = File.dirCreate(getFolder("Program", "uninstall"));
|
||||
logComment("dirCreate() of Program/uninstall returned: " + err);
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
var err = initInstall("Website Reporter", "Reporter", "$Version$");
|
||||
logComment("initInstall: " + err);
|
||||
|
||||
addDirectory("", "$Version$", "bin", getFolder("Program"), "", true);
|
||||
|
||||
var jarFolder = getFolder("Chrome", "reporter.jar");
|
||||
|
||||
registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/classic/reporter/");
|
||||
|
||||
err = getLastError();
|
||||
if (err==SUCCESS)
|
||||
performInstall();
|
||||
else
|
||||
cancelInstall(err);
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
classic.jar:
|
||||
% skin browser classic/1.0 %skin/classic/browser/
|
||||
skin/classic/browser/bookmark_toolbar_background.gif
|
||||
skin/classic/browser/bookmark-hover-left.png
|
||||
skin/classic/browser/bookmark-hover-mid.png
|
||||
|
|
@ -8,7 +9,6 @@ classic.jar:
|
|||
skin/classic/browser/bookmark-open-right.png
|
||||
skin/classic/browser/browser.css
|
||||
skin/classic/browser/browser.xml
|
||||
skin/classic/browser/contents.rdf
|
||||
skin/classic/browser/find.png
|
||||
skin/classic/browser/find-bar-background.png
|
||||
skin/classic/browser/Go.png
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
classic.jar:
|
||||
% skin browser classic/1.0 %skin/classic/browser/
|
||||
skin/classic/browser/browser.css
|
||||
skin/classic/browser/browser.xml
|
||||
skin/classic/browser/contents.rdf
|
||||
skin/classic/browser/Go.png
|
||||
skin/classic/browser/Go-rtl.png
|
||||
skin/classic/browser/Info.png
|
||||
|
|
|
|||
|
|
@ -4,9 +4,11 @@ reporter.jar:
|
|||
#ifdef MOZ_PHOENIX
|
||||
% overlay chrome://browser/content/browser.xul chrome://reporter/content/reporterOverlay.xul
|
||||
% overlay chrome://global/content/customizeToolbar.xul chrome://reporter/content/reporterOverlay.xul
|
||||
% skin reporter classic/1.0 %skin/classic/reporter/
|
||||
#endif
|
||||
#else
|
||||
content/reporter/contents.rdf (resources/content/reporter/contents.rdf)
|
||||
skin/classic/reporter/contents.rdf (resources/skin/classic/reporter/contents.rdf)
|
||||
#endif
|
||||
content/reporter/reportWizard.xul (resources/content/reporter/reportWizard.xul)
|
||||
content/reporter/reportWizard.js (resources/content/reporter/reportWizard.js)
|
||||
|
|
@ -15,7 +17,6 @@ reporter.jar:
|
|||
content/reporter/about.xul (resources/content/reporter/about.xul)
|
||||
content/reporter/error.xhtml (resources/content/reporter/error.xhtml)
|
||||
content/reporter/report.xhtml (resources/content/reporter/report.xhtml)
|
||||
skin/classic/reporter/contents.rdf (resources/skin/classic/reporter/contents.rdf)
|
||||
skin/classic/reporter/browserOverlay.css (resources/skin/classic/reporter/browserOverlay.css)
|
||||
skin/classic/reporter/icon.png (resources/skin/classic/reporter/icon.png)
|
||||
skin/classic/reporter/reportResults.css (resources/skin/classic/reporter/reportResults.css)
|
||||
|
|
|
|||
|
|
@ -120,6 +120,7 @@ bin\components\msgsmime.xpt
|
|||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
bin\chrome\classic.jar
|
||||
bin\chrome\classic.manifest
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
; Default Profile Settings
|
||||
|
|
|
|||
|
|
@ -797,13 +797,6 @@ if(verifyDiskSpace(fProgram, srDest))
|
|||
// we don't want to fail on errors for the above two
|
||||
resetError();
|
||||
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"), "skin/classic/global/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"), "skin/classic/communicator/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"), "skin/classic/mozapps/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"), "skin/classic/navigator/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"), "skin/classic/editor/");
|
||||
registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"), "skin/classic/messenger/");
|
||||
|
||||
// Create the uninstall folder.
|
||||
err = File.dirCreate(getFolder("Program", "uninstall"));
|
||||
logComment("dirCreate() of Program/uninstall returned: " + err);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
classic.jar:
|
||||
% skin editor classic/1.0 %skin/classic/editor/
|
||||
skin/classic/editor/editor.css
|
||||
skin/classic/editor/EditorDialog.css
|
||||
skin/classic/editor/EdImageMapPage.css
|
||||
|
|
@ -9,5 +10,3 @@ classic.jar:
|
|||
skin/classic/editor/icons/img-align-middle.gif
|
||||
skin/classic/editor/icons/img-align-right.gif
|
||||
skin/classic/editor/icons/img-align-top.gif
|
||||
* skin/classic/editor/contents.rdf
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,7 @@ classic.jar:
|
|||
skin/classic/global/preview.png
|
||||
skin/classic/global/tree/treetwisty.png (icons/treetwisty.png)
|
||||
skin/classic/global/tree/treetwisty-open.png (icons/treetwisty-open.png)
|
||||
* skin/classic/global/contents.rdf (global-contents.rdf)
|
||||
* skin/classic/messenger/contents.rdf
|
||||
% skin messenger classic/1.0 %skin/classic/messenger/
|
||||
skin/classic/messenger/dialogs.css
|
||||
skin/classic/messenger/messenger.css
|
||||
skin/classic/messenger/primaryToolbar.css
|
||||
|
|
@ -79,10 +78,10 @@ classic.jar:
|
|||
skin/classic/messenger/messengercompose/small-button-base.png (compose/small-button-base.png)
|
||||
skin/classic/messenger/messengercompose/small-button-disabled.png (compose/small-button-disabled.png)
|
||||
skin/classic/messenger/messengercompose/small-button-pressed.png (compose/small-button-pressed.png)
|
||||
% skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
|
||||
skin/classic/messenger-newsblog/feed-subscriptions.css (newsblog/feed-subscriptions.css)
|
||||
skin/classic/messenger-newsblog/newsBlogOverlay.css (newsblog/newsBlogOverlay.css)
|
||||
skin/classic/messenger-newsblog/icons/folder-search-rss.png (newsblog/folder-search-rss.png)
|
||||
skin/classic/messenger-newsblog/contents.rdf (newsblog/contents.rdf)
|
||||
skin/classic/messenger/preferences/preferences.css (preferences/preferences.css)
|
||||
skin/classic/messenger/preferences/mail-options.png (preferences/mail-options.png)
|
||||
skin/classic/messenger/smime/msgCompSMIMEOverlay.css (smime/msgCompSMIMEOverlay.css)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
classic.jar:
|
||||
% skin editor classic/1.0 %skin/classic/editor/
|
||||
skin/classic/editor/editor.css
|
||||
skin/classic/editor/EditorDialog.css
|
||||
skin/classic/editor/EdImageMapPage.css
|
||||
|
|
@ -9,5 +10,4 @@ classic.jar:
|
|||
skin/classic/editor/icons/img-align-middle.gif
|
||||
skin/classic/editor/icons/img-align-right.gif
|
||||
skin/classic/editor/icons/img-align-top.gif
|
||||
* skin/classic/editor/contents.rdf
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
classic.jar:
|
||||
+ skin/classic/global/tree.css
|
||||
*+ skin/classic/global/contents.rdf (global-contents.rdf)
|
||||
+ skin/classic/global/alerts/alert.css
|
||||
* skin/classic/messenger/contents.rdf
|
||||
skin/classic/communicator/communicator.css
|
||||
skin/classic/communicator/smileys.css
|
||||
% skin messenger classic/1.0 %skin/classic/messenger/
|
||||
skin/classic/messenger/primaryToolbar.css
|
||||
skin/classic/messenger/accountCentral.css
|
||||
skin/classic/messenger/accountManage.css
|
||||
|
|
@ -42,7 +41,7 @@ classic.jar:
|
|||
skin/classic/messenger/messengercompose/compose-toolbar.png (compose/compose-toolbar.png)
|
||||
skin/classic/messenger/messengercompose/compose-toolbar-small.png (compose/compose-toolbar-small.png)
|
||||
skin/classic/messenger/messengercompose/format-buttons.png (compose/format-buttons.png)
|
||||
skin/classic/messenger-newsblog/contents.rdf (newsblog/contents.rdf)
|
||||
% skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
|
||||
skin/classic/messenger-newsblog/feed-subscriptions.css (newsblog/feed-subscriptions.css)
|
||||
skin/classic/messenger-newsblog/newsBlogOverlay.css (newsblog/newsBlogOverlay.css)
|
||||
skin/classic/messenger-newsblog/icons/rss-feed.png (newsblog/rss-feed.png)
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
classic.jar:
|
||||
skin/classic/communicator/communicator.css
|
||||
skin/classic/communicator/contents.rdf
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
classic.jar:
|
||||
% skin global classic/1.0 %skin/classic/global/
|
||||
+ skin/classic/global/10pct_transparent_grey.png
|
||||
+ skin/classic/global/10pct_transparent_pixel.png
|
||||
+ skin/classic/global/20pct_transparent_pixel.png
|
||||
|
|
@ -15,7 +16,6 @@ classic.jar:
|
|||
+ skin/classic/global/closetab.png
|
||||
+ skin/classic/global/colorpicker.css
|
||||
+ skin/classic/global/config.css
|
||||
+ skin/classic/global/contents.rdf
|
||||
+ skin/classic/global/customizeToolbar.css
|
||||
+ skin/classic/global/dialog.css
|
||||
+ skin/classic/global/filepicker.css
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
classic.jar:
|
||||
* skin/classic/help/contents.rdf
|
||||
% skin help classic/1.0 %skin/classic/help/
|
||||
skin/classic/help/help.css
|
||||
skin/classic/help/Toolbar.png
|
||||
* skin/classic/help/helpFileLayout.css
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
classic.jar:
|
||||
% skin mozapps classic/1.0 %skin/classic/mozapps/
|
||||
skin/classic/mozapps/downloads/progress-bar-paused.gif (downloads/progress-bar-paused.gif)
|
||||
skin/classic/mozapps/downloads/progress-bar.gif (downloads/progress-bar.gif)
|
||||
skin/classic/mozapps/downloads/progress-remainder.gif (downloads/progress-remainder.gif)
|
||||
|
|
@ -36,6 +37,3 @@ classic.jar:
|
|||
skin/classic/mozapps/update/update.png (update/update.png)
|
||||
skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png (xpinstall/xpinstallItemGeneric.png)
|
||||
skin/classic/mozapps/xpinstall/xpinstallConfirm.css (xpinstall/xpinstallConfirm.css)
|
||||
skin/classic/mozapps/contents.rdf
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
classic.jar:
|
||||
skin/classic/communicator/brand.css
|
||||
skin/classic/communicator/button.css
|
||||
skin/classic/communicator/communicator.css
|
||||
skin/classic/communicator/contents.rdf
|
||||
skin/classic/communicator/dialogs.css
|
||||
skin/classic/communicator/formatting.css
|
||||
skin/classic/communicator/plugins.css
|
||||
skin/classic/communicator/prefpanels.css
|
||||
skin/classic/communicator/smileys.css
|
||||
skin/classic/communicator/tasksOverlay.css
|
||||
skin/classic/communicator/alerts/alert.css (alerts/alert.css)
|
||||
skin/classic/communicator/icons/loading.gif (icons/loading.gif)
|
||||
skin/classic/communicator/icons/lock-broken.gif (icons/lock-broken.gif)
|
||||
skin/classic/communicator/icons/lock-insecure.gif (icons/lock-insecure.gif)
|
||||
skin/classic/communicator/icons/lock-secure.gif (icons/lock-secure.gif)
|
||||
skin/classic/communicator/icons/offline.png (icons/offline.png)
|
||||
skin/classic/communicator/icons/online.png (icons/online.png)
|
||||
skin/classic/communicator/icons/smileys/cool_n.gif (icons/smileys/cool_n.gif)
|
||||
skin/classic/communicator/icons/smileys/cry_n.gif (icons/smileys/cry_n.gif)
|
||||
skin/classic/communicator/icons/smileys/embarrassed_n.gif (icons/smileys/embarrassed_n.gif)
|
||||
skin/classic/communicator/icons/smileys/foot_n.gif (icons/smileys/foot_n.gif)
|
||||
skin/classic/communicator/icons/smileys/frown_n.gif (icons/smileys/frown_n.gif)
|
||||
skin/classic/communicator/icons/smileys/innocent_n.gif (icons/smileys/innocent_n.gif)
|
||||
skin/classic/communicator/icons/smileys/kiss_n.gif (icons/smileys/kiss_n.gif)
|
||||
skin/classic/communicator/icons/smileys/laughing_n.gif (icons/smileys/laughing_n.gif)
|
||||
skin/classic/communicator/icons/smileys/money_n.gif (icons/smileys/money_n.gif)
|
||||
skin/classic/communicator/icons/smileys/sealed_n.gif (icons/smileys/sealed_n.gif)
|
||||
skin/classic/communicator/icons/smileys/smile_n.gif (icons/smileys/smile_n.gif)
|
||||
skin/classic/communicator/icons/smileys/smiley-cool.png (icons/smileys/smiley-cool.png)
|
||||
skin/classic/communicator/icons/smileys/smiley-cry.png (icons/smileys/smiley-cry.png)
|
||||
skin/classic/communicator/icons/smileys/smiley-embarassed.png (icons/smileys/smiley-embarassed.png)
|
||||
skin/classic/communicator/icons/smileys/smiley-foot-in-mouth.png (icons/smileys/smiley-foot-in-mouth.png)
|
||||
skin/classic/communicator/icons/smileys/smiley-frown.png (icons/smileys/smiley-frown.png)
|
||||
skin/classic/communicator/icons/smileys/smiley-innocent.png (icons/smileys/smiley-innocent.png)
|
||||
skin/classic/communicator/icons/smileys/smiley-kiss.png (icons/smileys/smiley-kiss.png)
|
||||
skin/classic/communicator/icons/smileys/smiley-laughing.png (icons/smileys/smiley-laughing.png)
|
||||
skin/classic/communicator/icons/smileys/smiley-money-mouth.png (icons/smileys/smiley-money-mouth.png)
|
||||
skin/classic/communicator/icons/smileys/smiley-sealed.png (icons/smileys/smiley-sealed.png)
|
||||
skin/classic/communicator/icons/smileys/smiley-smile.png (icons/smileys/smiley-smile.png)
|
||||
skin/classic/communicator/icons/smileys/smiley-surprised.png (icons/smileys/smiley-surprised.png)
|
||||
skin/classic/communicator/icons/smileys/smiley-tongue-out.png (icons/smileys/smiley-tongue-out.png)
|
||||
skin/classic/communicator/icons/smileys/smiley-undecided.png (icons/smileys/smiley-undecided.png)
|
||||
skin/classic/communicator/icons/smileys/smiley-wink.png (icons/smileys/smiley-wink.png)
|
||||
skin/classic/communicator/icons/smileys/smiley-yell.png (icons/smileys/smiley-yell.png)
|
||||
skin/classic/communicator/icons/smileys/surprise_n.gif (icons/smileys/surprise_n.gif)
|
||||
skin/classic/communicator/icons/smileys/tongue_n.gif (icons/smileys/tongue_n.gif)
|
||||
skin/classic/communicator/icons/smileys/undecided_n.gif (icons/smileys/undecided_n.gif)
|
||||
skin/classic/communicator/icons/smileys/wink_n.gif (icons/smileys/wink_n.gif)
|
||||
skin/classic/communicator/icons/smileys/yell_n.gif (icons/smileys/yell_n.gif)
|
||||
skin/classic/communicator/pref/pref.css (pref/pref.css)
|
||||
skin/classic/communicator/profile/migrate.gif (profile/migrate.gif)
|
||||
skin/classic/communicator/profile/profile.css (profile/profile.css)
|
||||
skin/classic/communicator/profile/profileicon-large.gif (profile/profileicon-large.gif)
|
||||
skin/classic/communicator/profile/profileManager.css (profile/profileManager.css)
|
||||
skin/classic/communicator/xpinstall/xpinstall.css (xpinstall/xpinstall.css)
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
classic.jar:
|
||||
% skin global classic/1.0 %skin/classic/global/
|
||||
skin/classic/global/arrow.css
|
||||
skin/classic/global/autocomplete.css
|
||||
skin/classic/global/browser.css
|
||||
|
|
@ -6,7 +7,6 @@ classic.jar:
|
|||
skin/classic/global/button.css
|
||||
skin/classic/global/checkbox.css
|
||||
skin/classic/global/colorpicker.css
|
||||
skin/classic/global/contents.rdf
|
||||
skin/classic/global/customizeToolbar.css
|
||||
skin/classic/global/dialog.css
|
||||
skin/classic/global/expander.css
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
classic.jar:
|
||||
skin/classic/help/contents.rdf
|
||||
skin/classic/help/sidebar.css
|
||||
skin/classic/help/sbtab-twisty.gif
|
||||
skin/classic/help/help.css
|
||||
skin/classic/help/helpFileLayout.css
|
||||
skin/classic/help/sbtab-twisty-open.gif
|
||||
skin/classic/help/sidebarBindings.xml
|
||||
skin/classic/help/zoomImg.png
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
classic.jar:
|
||||
skin/classic/mozapps/contents.rdf
|
||||
% skin mozapps classic/1.0 %skin/classic/mozapps/
|
||||
skin/classic/mozapps/downloads/downloadCleanup.png (downloads/downloadCleanup.png)
|
||||
skin/classic/mozapps/downloads/downloadCleanupDisabled.png (downloads/downloadCleanupDisabled.png)
|
||||
skin/classic/mozapps/downloads/downloadFader.png (downloads/downloadFader.png)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче