Created
June 7, 2012 23:26
-
-
Save cers/2892353 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/bug-754344 b/bug-754344 | |
| index 3821f33..20b8221 100644 | |
| --- a/bug-754344 | |
| +++ b/bug-754344 | |
| @@ -1,13 +1,12 @@ | |
| # HG changeset patch | |
| -# Parent f4981b5e1f7a1b7e951c7013a2bc30fb72c0e01c | |
| +# Parent 58bc22e5354276912ee185dbf752b2532005d39c | |
| # User Hernan Rodriguez Colmeiro <colmeiro@gmail.com> | |
| try: -b o -p linux,linux64,macosx64,win32,win64 -u none -t none | |
| diff --git a/browser/components/preferences/handlers.css b/browser/components/preferences/handlers.css | |
| --- a/browser/components/preferences/handlers.css | |
| +++ b/browser/components/preferences/handlers.css | |
| -@@ -1,25 +1,25 @@ | |
| - /* This Source Code Form is subject to the terms of the Mozilla Public | |
| +@@ -2,11 +2,11 @@ | |
| * 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/. */ | |
| @@ -21,13 +20,7 @@ diff --git a/browser/components/preferences/handlers.css b/browser/components/pr | |
| -moz-binding: url("chrome://browser/content/preferences/handlers.xml#handler-selected"); | |
| } | |
| - /** | |
| - * Make the icons appear. | |
| - * Note: we display the icon box for every item whether or not it has an icon | |
| - * so the labels of all the items align vertically. | |
| - */ | |
| - .actionsMenu > menupopup > menuitem > .menu-iconic-left { | |
| - display: -moz-box; | |
| +@@ -20,6 +20,6 @@ | |
| min-width: 16px; | |
| } | |
| @@ -38,12 +31,7 @@ diff --git a/browser/components/preferences/handlers.css b/browser/components/pr | |
| diff --git a/browser/components/preferences/in-content/advanced.xul b/browser/components/preferences/in-content/advanced.xul | |
| --- a/browser/components/preferences/in-content/advanced.xul | |
| +++ b/browser/components/preferences/in-content/advanced.xul | |
| -@@ -119,23 +119,18 @@ | |
| - type="bool"/> | |
| - </preferences> | |
| - | |
| - #ifdef HAVE_SHELL_SERVICE | |
| - <stringbundle id="bundleShell" src="chrome://browser/locale/shellservice.properties"/> | |
| +@@ -124,13 +124,8 @@ | |
| <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/> | |
| #endif | |
| @@ -58,20 +46,10 @@ diff --git a/browser/components/preferences/in-content/advanced.xul b/browser/co | |
| onselect="gAdvancedPane.tabSelectionChanged();"> | |
| <tabs id="tabsElement"> | |
| - <tab id="generalTab" label="&generalTab.label;" helpTopic="prefs-advanced-general"/> | |
| - <tab id="networkTab" label="&networkTab.label;" helpTopic="prefs-advanced-network"/> | |
| - <tab id="updateTab" label="&updateTab.label;" helpTopic="prefs-advanced-update"/> | |
| - <tab id="encryptionTab" label="&encryptionTab.label;" helpTopic="prefs-advanced-encryption"/> | |
| - </tabs> | |
| diff --git a/browser/components/preferences/in-content/applications.xul b/browser/components/preferences/in-content/applications.xul | |
| --- a/browser/components/preferences/in-content/applications.xul | |
| +++ b/browser/components/preferences/in-content/applications.xul | |
| -@@ -50,22 +50,17 @@ | |
| - type="bool"/> | |
| - </preferences> | |
| - | |
| - <keyset> | |
| - <key key="&focusSearch1.key;" modifiers="accel" oncommand="gApplicationsPane.focusFilterBox();"/> | |
| +@@ -55,12 +55,7 @@ | |
| <key key="&focusSearch2.key;" modifiers="accel" oncommand="gApplicationsPane.focusFilterBox();"/> | |
| </keyset> | |
| @@ -85,20 +63,10 @@ diff --git a/browser/components/preferences/in-content/applications.xul b/browse | |
| <hbox> | |
| <textbox id="filter" flex="1" | |
| type="search" | |
| - placeholder="&filter.emptytext;" | |
| - aria-controls="handlersView" | |
| - oncommand="gApplicationsPane.filter();"/> | |
| - </hbox> | |
| - | |
| diff --git a/browser/components/preferences/in-content/content.xul b/browser/components/preferences/in-content/content.xul | |
| --- a/browser/components/preferences/in-content/content.xul | |
| +++ b/browser/components/preferences/in-content/content.xul | |
| -@@ -28,22 +28,17 @@ | |
| - onchange="gContentPane._rebuildFonts();"/> | |
| - </preferences> | |
| - | |
| - <script type="application/javascript" | |
| - src="chrome://mozapps/content/preferences/fontbuilder.js"/> | |
| +@@ -33,12 +33,7 @@ | |
| <script type="application/javascript" | |
| src="chrome://browser/content/preferences/in-content/content.js"/> | |
| @@ -112,17 +80,7 @@ diff --git a/browser/components/preferences/in-content/content.xul b/browser/com | |
| <grid id="contentGrid"> | |
| <columns> | |
| <column flex="1"/> | |
| - <column/> | |
| - </columns> | |
| - <rows id="contentRows-1"> | |
| - <row id="popupPolicyRow"> | |
| - <vbox align="start"> | |
| -@@ -86,17 +81,17 @@ | |
| - preference="pref.advanced.javascript.disable_button.advanced"/> | |
| - </vbox> | |
| - </row> | |
| - </rows> | |
| - </grid> | |
| +@@ -91,7 +86,7 @@ | |
| </groupbox> | |
| <!-- Fonts and Colors --> | |
| @@ -131,17 +89,7 @@ diff --git a/browser/components/preferences/in-content/content.xul b/browser/com | |
| <caption label="&fontsAndColors.label;"/> | |
| <grid id="fontsGrid"> | |
| - <columns> | |
| - <column flex="1"/> | |
| - <column/> | |
| - </columns> | |
| - <rows id="fontsRows"> | |
| -@@ -147,19 +142,19 @@ | |
| - accesskey="&colors.accesskey;" | |
| - oncommand="gContentPane.configureColors();"/> | |
| - </row> | |
| - </rows> | |
| - </grid> | |
| +@@ -152,7 +147,7 @@ | |
| </groupbox> | |
| <!-- Languages --> | |
| @@ -150,9 +98,7 @@ diff --git a/browser/components/preferences/in-content/content.xul b/browser/com | |
| <caption label="&languages.label;"/> | |
| <hbox id="languagesBox" align="center"> | |
| - <description flex="1" control="chooseLanguage">&chooseLanguage.label;</description> | |
| - <button id="chooseLanguage" | |
| - label="&chooseButton.label;" | |
| +@@ -162,4 +157,4 @@ | |
| accesskey="&chooseButton.accesskey;" | |
| oncommand="gContentPane.showLanguages();"/> | |
| </hbox> | |
| @@ -162,12 +108,7 @@ diff --git a/browser/components/preferences/in-content/content.xul b/browser/com | |
| diff --git a/browser/components/preferences/in-content/main.xul b/browser/components/preferences/in-content/main.xul | |
| --- a/browser/components/preferences/in-content/main.xul | |
| +++ b/browser/components/preferences/in-content/main.xul | |
| -@@ -46,23 +46,18 @@ | |
| - type="file" | |
| - onchange="gMainPane.displayDownloadDirPref();"/> | |
| - <preference id="browser.download.folderList" | |
| - name="browser.download.folderList" | |
| - type="int"/> | |
| +@@ -51,13 +51,8 @@ | |
| </preferences> | |
| @@ -182,17 +123,7 @@ diff --git a/browser/components/preferences/in-content/main.xul b/browser/compon | |
| <caption label="&startup.label;"/> | |
| <hbox align="center"> | |
| - <label value="&startupPage.label;" | |
| - accesskey="&startupPage.accesskey;" | |
| - control="browserStartupPage"/> | |
| - <menulist id="browserStartupPage" | |
| - preference="browser.startup.page"> | |
| -@@ -111,17 +106,17 @@ | |
| - accesskey="&restoreDefault.accesskey;" | |
| - oncommand="gMainPane.restoreDefaultHomePage();" | |
| - id="restoreDefaultHomePage" | |
| - preference="pref.browser.homepage.disable_button.restore_default"/> | |
| - </hbox> | |
| +@@ -116,7 +111,7 @@ | |
| </groupbox> | |
| <!-- Downloads --> | |
| @@ -201,17 +132,7 @@ diff --git a/browser/components/preferences/in-content/main.xul b/browser/compon | |
| <caption label="&downloads.label;"/> | |
| <checkbox id="showWhenDownloading" | |
| - label="&showWhenDownloading.label;" | |
| - accesskey="&showWhenDownloading.accesskey;" | |
| - preference="browser.download.manager.showWhenStarting" | |
| - onsyncfrompreference="return gMainPane.readShowDownloadsWhenStarting();"/> | |
| - <checkbox id="closeWhenDone" | |
| -@@ -162,17 +157,17 @@ | |
| - </hbox> | |
| - <radio id="alwaysAsk" | |
| - value="false" | |
| - label="&alwaysAsk.label;" | |
| - accesskey="&alwaysAsk.accesskey;"/> | |
| +@@ -167,7 +162,7 @@ | |
| </radiogroup> | |
| </groupbox> | |
| @@ -220,20 +141,10 @@ diff --git a/browser/components/preferences/in-content/main.xul b/browser/compon | |
| <groupbox id="addonsMgrGroup" | |
| orient="horizontal" | |
| flex="1"> | |
| - <caption label="&addonsMgr.label;"/> | |
| - | |
| - <description control="manageAddons" | |
| - #ifdef XP_WIN | |
| - flex="1">&manageAddonsDescWin.label;</description> | |
| diff --git a/browser/components/preferences/in-content/preferences.js b/browser/components/preferences/in-content/preferences.js | |
| --- a/browser/components/preferences/in-content/preferences.js | |
| +++ b/browser/components/preferences/in-content/preferences.js | |
| -@@ -7,71 +7,193 @@ | |
| - const Cc = Components.classes; | |
| - const Ci = Components.interfaces; | |
| - const Cu = Components.utils; | |
| - const Cr = Components.results; | |
| - | |
| +@@ -12,66 +12,171 @@ | |
| Cu.import("resource://gre/modules/XPCOMUtils.jsm"); | |
| Cu.import("resource://gre/modules/Services.jsm"); | |
| @@ -279,23 +190,6 @@ diff --git a/browser/components/preferences/in-content/preferences.js b/browser/ | |
| + var initFinished = document.createEvent("Event"); | |
| + initFinished.initEvent("Initialized", true, true); | |
| + document.dispatchEvent(initFinished); | |
| -+ | |
| -+ // monkeypatch openDialog if needed | |
| -+ window._openDialog = window.openDialog; | |
| -+ window.openDialog = function() { | |
| -+ var dialog = window._openDialog.apply(this, arguments); | |
| -+ var prefs = Components.classes["@mozilla.org/preferences-service;1"] | |
| -+ .getService(Components.interfaces.nsIPrefService) | |
| -+ .getBranch("browser.preferences."); | |
| -+ | |
| -+ var inContent = prefs.getBoolPref("inContent"); | |
| -+ if (inContent) { | |
| -+ dialog.addEventListener("load", function() { | |
| -+ dialog.document.documentElement.instantApply = true; | |
| -+ }, false); | |
| -+ } | |
| -+ return dialog; | |
| -+ } | |
| + }, | |
| + | |
| + gotoPref: function gPreferences__gotoPref(page) { | |
| @@ -479,9 +373,7 @@ diff --git a/browser/components/preferences/in-content/preferences.js b/browser/ | |
| diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul | |
| --- a/browser/components/preferences/in-content/preferences.xul | |
| +++ b/browser/components/preferences/in-content/preferences.xul | |
| -@@ -1,25 +1,33 @@ | |
| - <?xml version="1.0"?> | |
| - <!-- This Source Code Form is subject to the terms of the Mozilla Public | |
| +@@ -3,18 +3,26 @@ | |
| - 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/. --> | |
| @@ -513,17 +405,7 @@ diff --git a/browser/components/preferences/in-content/preferences.xul b/browser | |
| <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> | |
| <!ENTITY % preferencesDTD SYSTEM | |
| "chrome://browser/locale/preferences/preferences.dtd"> | |
| - <!ENTITY % privacyDTD SYSTEM "chrome://browser/locale/preferences/privacy.dtd"> | |
| - <!ENTITY % tabsDTD SYSTEM "chrome://browser/locale/preferences/tabs.dtd"> | |
| - <!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd"> | |
| - <!ENTITY % syncDTD SYSTEM "chrome://browser/locale/preferences/sync.dtd"> | |
| - <!ENTITY % securityDTD SYSTEM | |
| -@@ -49,58 +57,138 @@ | |
| - | |
| - #ifdef XP_WIN | |
| - #define USE_WIN_TITLE_STYLE | |
| - #endif | |
| - #ifdef XP_OS2 | |
| +@@ -54,42 +62,110 @@ | |
| #define USE_WIN_TITLE_STYLE | |
| #endif | |
| @@ -658,10 +540,7 @@ diff --git a/browser/components/preferences/in-content/preferences.xul b/browser | |
| #include main.xul | |
| #include tabs.xul | |
| #include privacy.xul | |
| - #include advanced.xul | |
| - #include applications.xul | |
| - #include content.xul | |
| - #include security.xul | |
| +@@ -100,7 +176,19 @@ | |
| #ifdef MOZ_SERVICES_SYNC | |
| #include sync.xul | |
| #endif | |
| @@ -686,12 +565,7 @@ diff --git a/browser/components/preferences/in-content/preferences.xul b/browser | |
| diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul | |
| --- a/browser/components/preferences/in-content/privacy.xul | |
| +++ b/browser/components/preferences/in-content/privacy.xul | |
| -@@ -61,33 +61,28 @@ | |
| - type="bool"/> | |
| - <preference id="browser.privatebrowsing.keep_current_session" | |
| - name="browser.privatebrowsing.keep_current_session" | |
| - instantApply="true" | |
| - type="bool"/> | |
| +@@ -66,13 +66,8 @@ | |
| </preferences> | |
| @@ -706,9 +580,7 @@ diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/com | |
| <caption label="&tracking.label;"/> | |
| <checkbox id="privacyDoNotTrackPrefs" | |
| - label="&doNotTrack.label;" | |
| - accesskey="&doNotTrack.accesskey;" | |
| - preference="privacy.donottrackheader.enabled"/> | |
| +@@ -82,7 +77,7 @@ | |
| </groupbox> | |
| <!-- History --> | |
| @@ -717,17 +589,7 @@ diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/com | |
| <caption label="&history.label;"/> | |
| <hbox align="center"> | |
| <label id="historyModeLabel" | |
| - control="historyMode" | |
| - accesskey="&historyHeader.pre.accesskey;">&historyHeader.pre.label; | |
| - </label> | |
| - <menulist id="historyMode" | |
| - oncommand="gPrivacyPane.updateHistoryModePane(); | |
| -@@ -196,17 +191,17 @@ | |
| - </hbox> | |
| - </vbox> | |
| - </vbox> | |
| - </vbox> | |
| - </deck> | |
| +@@ -201,7 +196,7 @@ | |
| </groupbox> | |
| <!-- Location Bar --> | |
| @@ -736,17 +598,7 @@ diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/com | |
| <caption label="&locationBar.label;"/> | |
| <hbox align="center"> | |
| <label id="locationBarSuggestionLabel" | |
| - control="locationBarSuggestion" | |
| - accesskey="&locbar.pre.accessKey;">&locbar.pre.label;</label> | |
| - <menulist id="locationBarSuggestion" | |
| - preference="browser.urlbar.autocomplete.enabled" | |
| - onsyncfrompreference="return gPrivacyPane.readSuggestionPref();" | |
| -@@ -215,9 +210,9 @@ | |
| - <menuitem label="&locbar.both.label;" value="0"/> | |
| - <menuitem label="&locbar.history.label;" value="1"/> | |
| - <menuitem label="&locbar.bookmarks.label;" value="2"/> | |
| - <menuitem label="&locbar.nothing.label;" value="-1"/> | |
| - </menupopup> | |
| +@@ -220,4 +215,4 @@ | |
| </menulist> | |
| <label>&locbar.post.label;</label> | |
| </hbox> | |
| @@ -756,12 +608,7 @@ diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/com | |
| diff --git a/browser/components/preferences/in-content/security.xul b/browser/components/preferences/in-content/security.xul | |
| --- a/browser/components/preferences/in-content/security.xul | |
| +++ b/browser/components/preferences/in-content/security.xul | |
| -@@ -25,23 +25,18 @@ | |
| - name="browser.safebrowsing.enabled" | |
| - type="bool"/> | |
| - | |
| - <!-- Passwords --> | |
| - <preference id="signon.rememberSignons" name="signon.rememberSignons" type="bool"/> | |
| +@@ -30,13 +30,8 @@ | |
| </preferences> | |
| @@ -776,17 +623,7 @@ diff --git a/browser/components/preferences/in-content/security.xul b/browser/co | |
| <hbox id="addonInstallBox"> | |
| <checkbox id="warnAddonInstall" flex="1" | |
| label="&warnAddonInstall.label;" | |
| - accesskey="&warnAddonInstall.accesskey;" | |
| - preference="xpinstall.whitelist.required" | |
| - onsyncfrompreference="return gSecurityPane.readWarnAddonInstall();"/> | |
| - <button id="addonExceptions" | |
| - label="&addonExceptions.label;" | |
| -@@ -56,17 +51,17 @@ | |
| - preference="browser.safebrowsing.malware.enabled" /> | |
| - <checkbox id="blockWebForgeries" | |
| - label="&blockWebForgeries.label;" | |
| - accesskey="&blockWebForgeries.accesskey;" | |
| - preference="browser.safebrowsing.enabled" /> | |
| +@@ -61,7 +56,7 @@ | |
| </groupbox> | |
| <!-- Passwords --> | |
| @@ -795,20 +632,10 @@ diff --git a/browser/components/preferences/in-content/security.xul b/browser/co | |
| <caption label="&passwords.label;"/> | |
| <hbox id="savePasswordsBox"> | |
| - <checkbox id="savePasswords" flex="1" | |
| - label="&rememberPasswords.label;" accesskey="&rememberPasswords.accesskey;" | |
| - preference="signon.rememberSignons" | |
| - onsyncfrompreference="return gSecurityPane.readSavePasswords();"/> | |
| - <button id="passwordExceptions" | |
| diff --git a/browser/components/preferences/in-content/sync.xul b/browser/components/preferences/in-content/sync.xul | |
| --- a/browser/components/preferences/in-content/sync.xul | |
| +++ b/browser/components/preferences/in-content/sync.xul | |
| -@@ -23,22 +23,17 @@ | |
| - type="bool"/> | |
| - </preferences> | |
| - | |
| - <script type="application/javascript" | |
| - src="chrome://browser/content/preferences/in-content/sync.js"/> | |
| +@@ -28,12 +28,7 @@ | |
| <script type="application/javascript" | |
| src="chrome://browser/content/sync/utils.js"/> | |
| @@ -822,20 +649,10 @@ diff --git a/browser/components/preferences/in-content/sync.xul b/browser/compon | |
| <vbox id="noAccount" align="center"> | |
| <spacer flex="1"/> | |
| <description id="syncDesc"> | |
| - &weaveDesc.label; | |
| - </description> | |
| - <separator/> | |
| - <label class="text-link" | |
| - onclick="event.stopPropagation(); gSyncPane.openSetup(null);" | |
| diff --git a/browser/components/preferences/in-content/tabs.xul b/browser/components/preferences/in-content/tabs.xul | |
| --- a/browser/components/preferences/in-content/tabs.xul | |
| +++ b/browser/components/preferences/in-content/tabs.xul | |
| -@@ -28,58 +28,53 @@ | |
| - type="bool"/> | |
| - #ifdef XP_WIN | |
| - <preference id="browser.taskbar.previews.enable" | |
| - name="browser.taskbar.previews.enable" | |
| - type="bool"/> | |
| +@@ -33,13 +33,8 @@ | |
| #endif | |
| </preferences> | |
| @@ -850,7 +667,7 @@ diff --git a/browser/components/preferences/in-content/tabs.xul b/browser/compon | |
| accesskey="&newWindowsAsTabs.accesskey;" | |
| preference="browser.link.open_newwindow" | |
| onsyncfrompreference="return gTabsPane.readLinkTarget();" | |
| - onsynctopreference="return gTabsPane.writeLinkTarget();" | |
| +@@ -47,38 +42,38 @@ | |
| class="indent"/> | |
| <checkbox id="warnCloseMultiple" label="&warnCloseMultipleTabs.label;" | |
| @@ -895,16 +712,10 @@ diff --git a/browser/components/preferences/in-content/tabs.xul b/browser/compon | |
| accesskey="&showTabsInTaskbar.accesskey;" | |
| preference="browser.taskbar.previews.enable" | |
| class="indent"/> | |
| - #endif | |
| diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn | |
| --- a/browser/components/preferences/jar.mn | |
| +++ b/browser/components/preferences/jar.mn | |
| -@@ -20,16 +20,17 @@ browser.jar: | |
| - * content/browser/preferences/content.xul | |
| - * content/browser/preferences/content.js | |
| - * content/browser/preferences/connection.xul | |
| - * content/browser/preferences/connection.js | |
| - * content/browser/preferences/fonts.xul | |
| +@@ -25,6 +25,7 @@ | |
| * content/browser/preferences/fonts.js | |
| * content/browser/preferences/handlers.xml | |
| * content/browser/preferences/handlers.css | |
| @@ -912,20 +723,10 @@ diff --git a/browser/components/preferences/jar.mn b/browser/components/preferen | |
| * content/browser/preferences/languages.xul | |
| * content/browser/preferences/languages.js | |
| * content/browser/preferences/main.xul | |
| - * content/browser/preferences/main.js | |
| - * content/browser/preferences/permissions.xul | |
| - * content/browser/preferences/permissions.js | |
| - * content/browser/preferences/preferences.xul | |
| - * content/browser/preferences/privacy.xul | |
| diff --git a/browser/components/preferences/main.xul b/browser/components/preferences/main.xul | |
| --- a/browser/components/preferences/main.xul | |
| +++ b/browser/components/preferences/main.xul | |
| -@@ -59,17 +59,19 @@ | |
| - type="bool"/> | |
| - <preference id="browser.download.useDownloadDir" | |
| - name="browser.download.useDownloadDir" | |
| - type="bool"/> | |
| - <preference id="browser.download.dir" | |
| +@@ -64,7 +64,9 @@ | |
| name="browser.download.dir" | |
| type="file" | |
| onchange="gMainPane.displayDownloadDirPref();"/> | |
| @@ -936,11 +737,6 @@ diff --git a/browser/components/preferences/main.xul b/browser/components/prefer | |
| </preferences> | |
| - <stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences/preferences.properties"/> | |
| - | |
| - <!-- Startup --> | |
| - <groupbox id="startupGroup"> | |
| - <caption label="&startup.label;"/> | |
| diff --git a/browser/components/preferences/preferences.css b/browser/components/preferences/preferences.css | |
| new file mode 100644 | |
| --- /dev/null | |
| @@ -979,12 +775,7 @@ new file mode 100644 | |
| diff --git a/browser/themes/gnomestripe/jar.mn b/browser/themes/gnomestripe/jar.mn | |
| --- a/browser/themes/gnomestripe/jar.mn | |
| +++ b/browser/themes/gnomestripe/jar.mn | |
| -@@ -8,17 +8,25 @@ browser.jar: | |
| - skin/classic/browser/sanitizeDialog.css (sanitizeDialog.css) | |
| - * skin/classic/browser/aboutPrivateBrowsing.css (aboutPrivateBrowsing.css) | |
| - * skin/classic/browser/aboutSessionRestore.css (aboutSessionRestore.css) | |
| - skin/classic/browser/aboutSessionRestore-window-icon.png | |
| - skin/classic/browser/aboutCertError.css | |
| +@@ -13,7 +13,15 @@ | |
| skin/classic/browser/aboutCertError_sectionCollapsed.png | |
| skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png | |
| skin/classic/browser/aboutCertError_sectionExpanded.png | |
| @@ -1000,11 +791,6 @@ diff --git a/browser/themes/gnomestripe/jar.mn b/browser/themes/gnomestripe/jar. | |
| skin/classic/browser/aboutSyncTabs.css | |
| #endif | |
| skin/classic/browser/actionicon-tab.png | |
| - * skin/classic/browser/browser.css (browser.css) | |
| - * skin/classic/browser/engineManager.css (engineManager.css) | |
| - skin/classic/browser/Geolocation-16.png | |
| - skin/classic/browser/Geolocation-64.png | |
| - skin/classic/browser/Go-arrow.png | |
| diff --git a/browser/themes/gnomestripe/preferences/prefs-advanced.png b/browser/themes/gnomestripe/preferences/prefs-advanced.png | |
| new file mode 100644 | |
| index 0000000000000000000000000000000000000000..fce15e0b031475205f866c7de613f38a5aa6cf97 | |
| @@ -1378,12 +1164,7 @@ UN1YHAK>z>%07*qoM6N<$f}0ZKfdBvi | |
| diff --git a/browser/themes/pinstripe/jar.mn b/browser/themes/pinstripe/jar.mn | |
| --- a/browser/themes/pinstripe/jar.mn | |
| +++ b/browser/themes/pinstripe/jar.mn | |
| -@@ -98,17 +98,25 @@ browser.jar: | |
| - skin/classic/browser/places/expander-closed-active.png (places/expander-closed-active.png) | |
| - skin/classic/browser/places/expander-closed.png (places/expander-closed.png) | |
| - skin/classic/browser/places/expander-open-active.png (places/expander-open-active.png) | |
| - skin/classic/browser/places/expander-open.png (places/expander-open.png) | |
| - skin/classic/browser/places/livemark-item.png (places/livemark-item.png) | |
| +@@ -103,7 +103,15 @@ | |
| skin/classic/browser/preferences/alwaysAsk.png (preferences/alwaysAsk.png) | |
| skin/classic/browser/preferences/application.png (preferences/application.png) | |
| skin/classic/browser/preferences/Options.png (preferences/Options.png) | |
| @@ -1399,11 +1180,6 @@ diff --git a/browser/themes/pinstripe/jar.mn b/browser/themes/pinstripe/jar.mn | |
| skin/classic/browser/preferences/Options-sync.png (preferences/Options-sync.png) | |
| #endif | |
| skin/classic/browser/preferences/saveFile.png (preferences/saveFile.png) | |
| - * skin/classic/browser/preferences/preferences.css (preferences/preferences.css) | |
| - * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css) | |
| - skin/classic/browser/preferences/applications.css (preferences/applications.css) | |
| - skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) | |
| - skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon.png (tabbrowser/alltabs-box-bkgnd-icon.png) | |
| diff --git a/browser/themes/pinstripe/preferences/prefs-advanced.png b/browser/themes/pinstripe/preferences/prefs-advanced.png | |
| new file mode 100644 | |
| index 0000000000000000000000000000000000000000..d40f3f6fa6596c551b11502095dfd9eefed37da7 | |
| @@ -1758,12 +1534,7 @@ c6@Lxi0mR@!nEg%qmjD0&07*qoM6N<$f_`&9Qvd(} | |
| diff --git a/browser/themes/winstripe/jar.mn b/browser/themes/winstripe/jar.mn | |
| --- a/browser/themes/winstripe/jar.mn | |
| +++ b/browser/themes/winstripe/jar.mn | |
| -@@ -285,17 +285,25 @@ browser.jar: | |
| - skin/classic/aero/browser/places/allBookmarks.png (places/allBookmarks-aero.png) | |
| - skin/classic/aero/browser/places/unsortedBookmarks.png (places/unsortedBookmarks-aero.png) | |
| - skin/classic/aero/browser/places/downloads.png (places/downloads.png) | |
| - skin/classic/aero/browser/places/livemark-item.png (places/livemark-item.png) | |
| - skin/classic/aero/browser/preferences/alwaysAsk.png (preferences/alwaysAsk-aero.png) | |
| +@@ -294,7 +294,15 @@ | |
| skin/classic/aero/browser/preferences/application.png (preferences/application-aero.png) | |
| skin/classic/aero/browser/preferences/mail.png (preferences/mail-aero.png) | |
| skin/classic/aero/browser/preferences/Options.png (preferences/Options-aero.png) | |
| @@ -1779,11 +1550,6 @@ diff --git a/browser/themes/winstripe/jar.mn b/browser/themes/winstripe/jar.mn | |
| skin/classic/aero/browser/preferences/Options-sync.png (preferences/Options-sync.png) | |
| #endif | |
| skin/classic/aero/browser/preferences/saveFile.png (preferences/saveFile-aero.png) | |
| - * skin/classic/aero/browser/preferences/preferences.css (preferences/preferences.css) | |
| - skin/classic/aero/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css) | |
| - skin/classic/aero/browser/preferences/applications.css (preferences/applications.css) | |
| - skin/classic/aero/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) | |
| - skin/classic/aero/browser/tabbrowser/alltabs.png (tabbrowser/alltabs.png) | |
| diff --git a/browser/themes/winstripe/preferences/prefs-advanced-aero.png b/browser/themes/winstripe/preferences/prefs-advanced-aero.png | |
| new file mode 100644 | |
| index 0000000000000000000000000000000000000000..4130b13031bc1ed5c46d5b05eeaa571d8389aae8 | |
| @@ -2383,12 +2149,7 @@ GLSTX)$yq)C | |
| diff --git a/toolkit/themes/pinstripe/mozapps/jar.mn b/toolkit/themes/pinstripe/mozapps/jar.mn | |
| --- a/toolkit/themes/pinstripe/mozapps/jar.mn | |
| +++ b/toolkit/themes/pinstripe/mozapps/jar.mn | |
| -@@ -49,16 +49,17 @@ toolkit.jar: | |
| - * skin/classic/mozapps/extensions/selectAddons.css (extensions/selectAddons.css) | |
| - skin/classic/mozapps/extensions/update.css (extensions/update.css) | |
| - skin/classic/mozapps/extensions/eula.css (extensions/eula.css) | |
| - skin/classic/mozapps/extensions/blocklist.css (extensions/blocklist.css) | |
| - * skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css) | |
| +@@ -54,6 +54,7 @@ | |
| skin/classic/mozapps/passwordmgr/key.png (passwordmgr/key.png) | |
| skin/classic/mozapps/passwordmgr/key-16.png (passwordmgr/key-16.png) | |
| skin/classic/mozapps/passwordmgr/key-64.png (passwordmgr/key-64.png) | |
| @@ -2396,11 +2157,6 @@ diff --git a/toolkit/themes/pinstripe/mozapps/jar.mn b/toolkit/themes/pinstripe/ | |
| skin/classic/mozapps/plugins/contentPluginBlocked.png (plugins/contentPluginBlocked.png) | |
| skin/classic/mozapps/plugins/contentPluginCrashed.png (plugins/contentPluginCrashed.png) | |
| skin/classic/mozapps/plugins/contentPluginDisabled.png (plugins/contentPluginDisabled.png) | |
| - skin/classic/mozapps/plugins/contentPluginDownload.png (plugins/contentPluginDownload.png) | |
| - skin/classic/mozapps/plugins/contentPluginMissing.png (plugins/contentPluginMissing.png) | |
| - skin/classic/mozapps/plugins/contentPluginClickToPlay.png (plugins/contentPluginClickToPlay.png) | |
| - skin/classic/mozapps/plugins/notifyPluginBlocked.png (plugins/notifyPluginGeneric.png) | |
| - skin/classic/mozapps/plugins/notifyPluginCrashed.png (plugins/notifyPluginGeneric.png) | |
| diff --git a/toolkit/themes/pinstripe/mozapps/preferences/preferencesGeneric-16.png b/toolkit/themes/pinstripe/mozapps/preferences/preferencesGeneric-16.png | |
| new file mode 100644 | |
| index 0000000000000000000000000000000000000000..cd126bba538cd34e6af0960b3f316bd1d818bc0e |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment