Bug 452723: Fennec app icon in Maemo N800/N810 task navigator [r=bugmail]
authorBen Combee <combee@mozilla.com>
Fri, 11 Sep 2009 20:34:26 -0400
changeset 65551 54dcf697fc0d65656e295f97eb2ade3666b3691a
parent 65550 b5e2d8e80b94102dc494d83e86c2d070d9f8f1d5
child 65552 e2b70a0763d1d1682ffa3a5fcc667a87853ddd0d
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbugmail
bugs452723
Bug 452723: Fennec app icon in Maemo N800/N810 task navigator [r=bugmail]
mobile/installer/Makefile.in
mobile/installer/debian/fennec.desktop.in
mobile/installer/debian/fennec_26x26.png
mobile/installer/debian/fennec_40x40.png
--- a/mobile/installer/Makefile.in
+++ b/mobile/installer/Makefile.in
@@ -15,16 +15,17 @@
 #
 # The Initial Developer of the Original Code is
 # the Mozilla Foundation <http://www.mozilla.org/>.
 # Portions created by the Initial Developer are Copyright (C) 2007
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #   Mark Finkle <mfinkle@mozilla.com>
+#   Ben Combee <bcombee@mozilla.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
 # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 # in which case the provisions of the GPL or the LGPL are applicable instead
 # of those above. If you wish to allow use of your version of this file only
 # under the terms of either the GPL or the LGPL, and not to allow others to
 # use your version of this file under the terms of the MPL, indicate your
@@ -104,16 +105,20 @@ deb: debian/control
 	$(NSINSTALL) -D $(DEBDESTDIR)/usr/local
 	cd $(DEBDESTDIR)/usr/local; bunzip2 -c $(DEPTH)/../../../../dist/$(PKG_BASENAME)$(PKG_SUFFIX) | $(UNPACK_TAR)  
 	rm -rf $(DEBDESTDIR)/usr/local/$(MOZ_APP_NAME)/xulrunner	
 	$(NSINSTALL)  debian/$(MOZ_APP_NAME).desktop $(DEBDESTDIR)/usr/share/applications/hildon/
 	$(NSINSTALL) -D $(DEBDESTDIR)/usr/share/dbus-1/services/
 	cp debian/$(MOZ_APP_NAME).service $(DEBDESTDIR)/usr/share/dbus-1/services/org.mozilla.$(MOZ_APP_NAME).service
 	$(NSINSTALL) -D $(DEBDESTDIR)/usr/share/icons/hicolor/scalable/hildon/
 	cp $(srcdir)/debian/$(MOZ_APP_NAME)_scalable.png $(DEBDESTDIR)/usr/share/icons/hicolor/scalable/hildon/$(MOZ_APP_NAME).png
+	$(NSINSTALL) -D $(DEBDESTDIR)/usr/share/icons/hicolor/26x26/hildon/
+	cp $(srcdir)/debian/$(MOZ_APP_NAME)_26x26.png $(DEBDESTDIR)/usr/share/icons/hicolor/26x26/hildon/$(MOZ_APP_NAME).png
+	$(NSINSTALL) -D $(DEBDESTDIR)/usr/share/icons/hicolor/40x40/hildon/
+	cp $(srcdir)/debian/$(MOZ_APP_NAME)_40x40.png $(DEBDESTDIR)/usr/share/icons/hicolor/26x26/hildon/$(MOZ_APP_NAME).png
 	dh_link; fakeroot dh_fixperms; fakeroot dh_installdeb; dh_shlibdeps; fakeroot dh_gencontrol; fakeroot dh_md5sums; dh_builddeb
 
 installer: deb
 	@echo Installer DEB created!
 
 endif
 
 ifdef MOZ_FASTSTART
--- a/mobile/installer/debian/fennec.desktop.in
+++ b/mobile/installer/debian/fennec.desktop.in
@@ -1,17 +1,20 @@
 [Desktop Entry]
 Version=@MOZ_APP_VERSION@
 Encoding=UTF-8
 Name=@MOZ_APP_DISPLAYNAME@
-Comment=Fennec mobile browser
+Comment=@MOZ_APP_DISPLAYNAME@ mobile browser
 GenericName=@MOZ_APP_DISPLAYNAME@
 Exec=/usr/local/fennec/fennec
+StartupWMClass=Navigator
+StartupNotify=true
 Terminal=false
 X-MultipleArgs=false
 Type=Application
+X-Icon-Path=/usr/share/icons
 Icon=@MOZ_APP_NAME@
+X-Window-Icon=@MOZ_APP_NAME@
+X-Window-Icon-dimmed=@MOZ_APP_NAME@
 Categories=Application;Network;
 MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;
-StartupWMClass=@MOZ_APP_DISPLAYNAME@
-StartupNotify=true
 X-Osso-Service=Mozilla.@MOZ_APP_DISPLAYNAME@
 
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5c97a5d4daffa1afee77b107b18e04c27cbdc49b
GIT binary patch
literal 1677
zc$@)^26Fj{P)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXW1
z6+0Cdy1Bjp00s?7L_t(Y$K{r9Ok7nO#-DR%?)>ErFw8&^1`rTztLz4X#0ICtQtAe<
z)^^*{Xi;mT+3ZH6apR`jCAzMyA2!+DxOO*cS8TP|O10Z!Td1|5P?8p~Eg*lkLm8Nv
zGB9(8xifd}+<WJq{b1H)TX#+N&nM5Pb55ST=Y5is-}3_B>(&4H*?&4;80i1s74Pfs
z`%cZ7?vvlC(SOnP4y<N_UQi6$qQq*OH*N#~wCy{9mtK4Vlb7ev_Q%c)Z&-TVBQifu
z&*dtVsKiK-*vx9Hdb+}8eq(-?_W+;(aG|>$_cpWw0M4B`MluZw2`!5n88~$?$6~+*
zS<`<BmhBXi+Cbfgtup{{wY|ge^KoVSf-&v&tlM2&d0`eR%dLnf3C6EQaiwnrbZ8J&
z1=iozR+Q}9_LH4U0C4j75w5JjS|;$qT0K?Q`6B9Tr2mumRv1YlU{5!JF`AH2$dr`Q
zzcV=<>)C(W(|S?1{d85+8r)uxLDiH-?kci^0=POYz$poI{DUqsKXnc6)(3j)^~vYg
z)VXr>O5$;0nQtblVw92!=0)x~eIzQyEUbE!s{GxIjzP&C#bu0M_sUd6{@Ha=%rUKY
zL0a_FNP&SE({%Vsh(QA&XK3(+Q$$HfR0>DPV2X9u=8?bZrLe_68^};oGK@we<wb@N
zR@bZB+_Fm}ijb>HF?URe)4A(@Vl|scbx9@{&(9&Fj0MzbB~fSyDGF{RWCX<|LUIxj
z28gDo5mH-8n~IENXQ9T8k4%`72?eZ?1;Y>$7IhvzrtT#G@X@<(+?U44r)@U9#g@(?
zF2unwz^Xe7@xs6|I%Xv>W&<=<2cjc@2FUY4D6;_=OY-nQi5>gba2Oh%z=~WaSXPJ7
zB9DcTfH;%>lF3>2YdrwSnRgB?`!AhY4hJ`B8m0M#xg_T{2ma>qV{fes^K+v(_f-fM
zvk57N0BQ>2=R=S~VN_YG@#fPHLR=QG`tDLpPkRycErO;r$ZT35VXz$A(bSM)9xDg7
zHQz5%F6Z^6O5&=bz&GbdVEzUi&J1{Ge0cRorN|SOz+V}IIxzuhY7(*%L#9E(?{?k;
zBcb53oJbiQC@3z0-I+zjWQrz;?a;0#pSS`5q`T)V8rIhX06PBir&k2;*lx4ULGAfP
zBrD4fgSrT)Nu<na5EY=fs2D2MFgi8~n@)i<-GrR7dmvH{e87X5vCA~%^AOpZH(J@y
zQd7OsCBA*&00;o|_4UE+b^`zo{`vRshdg5~CM$>HiW<7A`aY6ax&|&409Ye*W;?WG
z99l905C+6i37Bk{zC47fkpaY(7NB>y7FN3-{6Sq!#lndbC(zv73<dz)Za2>Me9f^(
zpL%A8X3OiCoSBE;>p{>r150`a5=j}+a2S!mb?`wyqR|9IF$t<kh(^K)F9zuK`5O=|
z*}=k!d)L&}R4jb>VJDiKo4-cTKUh@1z8+_~d$6HlJ;uG^mxo8L-5=)p>=hXXYKqwj
z)l|r`ij<ZDD8Mib46F{4=OXwRXy@S$GUi=GLu2DFnl`NS96fpzTefWehIQoI07xk%
zt&i+{RpR|GuKi&tGVBi69qHgW7OElxAkgXb5MnBp7D9+cdHUI<DPqoc^>1z2{%})c
zWANsh%*_|4PIZG2Lfa3$`&w8w41Romgu04L=%`Ob*STTDq6r8Q5l6Z%VAL0fGj|1!
zoE;_skp#E4Y-?+3Yz(%w?YX7-Z*|mh_<d||*#U1LSp32MeG^qH^V!l$H*N%%;2r6w
zjGjetRUJ4pA+uKpajJh5HT4fYv*qDUf7t!YJy>7A4s~^P|K1S*Y;V~C04T`K_N*+w
zW3Q;{2F6A%hRW}%0x?(!mvtM-FDfEqUtUsUnqjJ@y7IU))6ot9Yu&ZCJn}Cc0l?w*
zx6#tN3yT^h#}6IOW|D%vw7mS~rSXef^cFKzi*tCH=bw!$WX_eF!*AU5(DHwru01C|
zy5*DXdEwdK-~4L#%;3;a?#=pxZ|(o@BmI-ETjRR(Sm*y|I642>r{C;*d(VHrCpG*X
X<(k9cQX-E500000NkvXXu0mjf(W4)q
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..13532c21c13455285573a8fb062f7b9cd6cd172b
GIT binary patch
literal 2997
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