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 659 fa96cf6ffd14
parent 653 38c67b6b2f37
child 718 6cb1ac7cd223 
--- a/firefox-branded-icons.patch	Mon Jun 17 22:57:16 2013 +0200
+++ b/firefox-branded-icons.patch	Tue Jul 16 12:35:11 2013 +0200
@@ -1,13 +1,13 @@
 # HG changeset patch
-# Parent a5cc092ab98bc6d4c1b09b5cc86791bae1313c73
+# Parent 5defe7bd2f041c227fe4a65f8a90e6cc42a9a339
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -136,16 +136,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
+@@ -133,16 +133,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
  endif
  
- ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+ ifdef MOZ_WIDGET_GTK
  libs::
  	$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons
  	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png  $(FINAL_TARGET)/chrome/icons/default
@@ -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
-@@ -574,18 +574,21 @@
+@@ -571,18 +571,21 @@
  @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
  @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
  @BINPATH@/chrome/toolkit@JAREXT@
  @BINPATH@/chrome/toolkit.manifest
  @BINPATH@/chrome/recording.manifest
  @BINPATH@/chrome/recording/*
- #ifdef MOZ_GTK2
+ #ifdef MOZ_GTK
  @BINPATH@/browser/chrome/icons/default/default16.png
 +@BINPATH@/browser/chrome/icons/default/default22.png
 +@BINPATH@/browser/chrome/icons/default/default24.png
mozilla