32x32 icons for Bug 404402 - Ship and use different sizes of the Firefox icon. rs=mconnor, coattailing in on r/a from earlier 48x48 icons addition.

2008-01-29 21:38:52 -08:00 · 2008-01-29 21:38:52 -08:00 · 7105adde1f
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@ -314,6 +314,7 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 libs::
 	$(INSTALL) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default
+	$(INSTALL) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default
 	$(INSTALL) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default
 endif

@ -341,6 +342,7 @@ ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
 endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 	cp $(srcdir)/default16.png   $(DIST)/branding/default16.png
+	cp $(srcdir)/default32.png   $(DIST)/branding/default32.png
 	cp $(srcdir)/default48.png   $(DIST)/branding/default48.png
 endif
 ifeq ($(OS_ARCH),OS2)
--- a/browser/app/default32.png
+++ b/browser/app/default32.png
--- a/browser/branding/unofficial/Makefile.in
+++ b/browser/branding/unofficial/Makefile.in
@ -21,6 +21,7 @@ include $(topsrcdir)/config/rules.mk

 BROWSER_APP_FILES = \
 	default16.png \
+	default32.png \
 	default48.png \
 	mozicon128.png \
 	mozicon16.xpm \
--- a/browser/branding/unofficial/default32.png
+++ b/browser/branding/unofficial/default32.png
--- a/browser/installer/unix/packages-static
+++ b/browser/installer/unix/packages-static
@ -275,6 +275,7 @@ bin/chrome/comm.manifest
 bin/chrome/toolkit.jar
 bin/chrome/toolkit.manifest
 bin/chrome/icons/default/default16.png
+bin/chrome/icons/default/default32.png
 bin/chrome/icons/default/default48.png
 bin/chrome/reporter.manifest
 bin/chrome/reporter.jar
--- a/other-licenses/branding/firefox/Makefile.in
+++ b/other-licenses/branding/firefox/Makefile.in
@ -21,6 +21,7 @@ include $(topsrcdir)/config/rules.mk

 BROWSER_APP_FILES = \
 	default16.png \
+	default32.png \
 	default48.png \
 	mozicon128.png \
 	mozicon16.xpm \
--- a/other-licenses/branding/firefox/default32.png
+++ b/other-licenses/branding/firefox/default32.png
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@ -228,6 +228,7 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 libs::
 	$(INSTALL) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default
+	$(INSTALL) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default
 	$(INSTALL) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default
 endif

@ -249,6 +250,7 @@ ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
 endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 	cp $(srcdir)/default16.png   $(DIST)/branding/default16.png
+	cp $(srcdir)/default32.png   $(DIST)/branding/default32.png
 	cp $(srcdir)/default48.png   $(DIST)/branding/default48.png
 endif
 ifeq ($(OS_ARCH),OS2)
--- a/xulrunner/app/default32.png
+++ b/xulrunner/app/default32.png