Bug 865210 - Set a valid window icon for B2G desktop; r=vingtetun
☠☠ backed out by 29027b21bd19 ☠ ☠
authorAlexandre Poirot <poirot.alex@gmail.com>
Fri, 26 Apr 2013 15:38:38 -0700
changeset 141115 0444a6571cac32487afdfb946bc7c04dd7e1fe67
parent 141114 6e30c424614094feeed3e618682e72c4630c3f8d
child 141116 29027b21bd1959256c340acf6e8a7684f131035e
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvingtetun
bugs865210
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 865210 - Set a valid window icon for B2G desktop; r=vingtetun
b2g/app/Makefile.in
b2g/app/b2g.ico
b2g/app/default.png
--- a/b2g/app/Makefile.in
+++ b/b2g/app/Makefile.in
@@ -153,11 +153,14 @@ ifdef LIBXUL_SDK
 endif
 endif # SKIP_COPY_XULRUNNER
 
 	$(NSINSTALL) -D $(DIST)/bin/chrome/icons/default
 
 ifeq ($(OS_ARCH),WINNT)
 	cp $(srcdir)/$(APP_ICON).ico $(DIST)/bin/chrome/icons/default/$(APP_ICON).ico
 	$(REDIT_PATH)/redit$(HOST_BIN_SUFFIX) $(DIST)/bin/$(APP_BINARY) $(srcdir)/$(APP_ICON).ico
+	cp $(srcdir)/$(APP_ICON).ico $(DIST)/bin/chrome/icons/default/default.ico
+else
+	cp $(srcdir)/default.png $(DIST)/bin/chrome/icons/default/default.png
 endif
 
 endif
index 38312abac42830818edef700470cf1c59b25bb81..5d4a61dc92ba5b08b2ff0587fb2877e7007c940e
GIT binary patch
literal 4286
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
E1?Jf~jsO4v
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c4307fc8418436bb6b2fd3a6afc702c2db28aa77
GIT binary patch
literal 4762
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