Mercurial Mercurial > hg > mozilla / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
firefox-branded-icons.patch
branchfirefox46
changeset 909 c6717354928b
parent 904 6a889427cd4f
child 923 3cc9f17ca9bb 
--- a/firefox-branded-icons.patch	Sun Jan 24 13:40:23 2016 +0100
+++ b/firefox-branded-icons.patch	Thu Apr 28 17:08:03 2016 +0200
@@ -1,6 +1,6 @@
 # HG changeset patch
 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de
-# Parent  e10e9bf6ab3a74655998bd0286d248f5d17a601a
+# Parent  a5764b0a088418fdbf4b774a8ff2745cc99f6706
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
@@ -30,26 +30,26 @@
 diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild
 --- a/browser/branding/branding-common.mozbuild
 +++ b/browser/branding/branding-common.mozbuild
-@@ -32,12 +32,15 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
-         'disk.icns',
-         'document.icns',
-         'dsstore',
-         'firefox.icns',
-     ]
- elif CONFIG['MOZ_WIDGET_GTK']:
-     BRANDING_FILES += [
-         'default16.png',
-+	'default22.png',
-+	'default24.png',
-+	'default256.png',
-         'default32.png',
-         'default48.png',
-         'mozicon128.png',
-     ]
+@@ -34,12 +34,15 @@ def FirefoxBranding():
+             'disk.icns',
+             'document.icns',
+             'dsstore',
+             'firefox.icns',
+         ]
+     elif CONFIG['MOZ_WIDGET_GTK']:
+         BRANDING_FILES += [
+             'default16.png',
++            'default22.png',
++            'default24.png',
++            'default256.png',
+             'default32.png',
+             'default48.png',
+             'mozicon128.png',
+         ]
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -670,18 +670,21 @@
+@@ -664,18 +664,21 @@
  @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
  @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
  @RESPATH@/chrome/toolkit@JAREXT@
@@ -64,10 +64,10 @@
  @RESPATH@/browser/chrome/icons/default/default48.png
 +@RESPATH@/browser/chrome/icons/default/default256.png
  #endif
+ @RESPATH@/browser/features/*
  
  ; [Webide Files]
  @RESPATH@/browser/chrome/webide@JAREXT@
  @RESPATH@/browser/chrome/webide.manifest
  @RESPATH@/browser/@PREF_DIR@/webide-prefs.js
  
- ; DevTools
mozilla