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
changeset 409 ff30593d2daa
parent 382 67f876aafae8
child 419 f6b055dd94bc 
--- a/firefox-branded-icons.patch	Tue Mar 13 08:06:57 2012 +0100
+++ b/firefox-branded-icons.patch	Thu Mar 15 10:33:22 2012 +0100
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent efffa19fa0b2530d2aca1ebd5b885a6fc68e51de
+# Parent d6bb5c163142d233d00e739e21aa9df16077873e
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -169,16 +169,21 @@ endif # LIBXUL_SDK
+@@ -164,16 +164,21 @@ endif # LIBXUL_SDK
  DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
  
  ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@@ -54,14 +54,14 @@
 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
-@@ -424,18 +424,21 @@
+@@ -432,18 +432,21 @@
+ @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
  #ifdef SHIP_FEEDBACK
  @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
  #endif
  @BINPATH@/chrome/toolkit@JAREXT@
  @BINPATH@/chrome/toolkit.manifest
- #ifdef XP_UNIX
- #ifndef XP_MACOSX
+ #ifdef MOZ_GTK2
  @BINPATH@/chrome/icons/default/default16.png
 +@BINPATH@/chrome/icons/default/default22.png
 +@BINPATH@/chrome/icons/default/default24.png
@@ -69,10 +69,10 @@
  @BINPATH@/chrome/icons/default/default48.png
 +@BINPATH@/chrome/icons/default/default256.png
  #endif
- #endif
- 
  
  ; shell icons
  #ifdef XP_UNIX
  #ifndef XP_MACOSX
  @BINPATH@/icons/*.xpm
+ @BINPATH@/icons/*.png
+ #endif
mozilla