From 2182d8e54be4cb25fc8fb35801c1f0f0b1c326ca Mon Sep 17 00:00:00 2001
From: Ariya Hidayat <ariya.hidayat@gmail.com>
Date: Fri, 18 Mar 2011 23:40:40 -0700
Subject: [PATCH] Add icon files for Windows and OS/2.

Issue: http://code.google.com/p/phantomjs/issues/detail?id=60

This improvement is provided by Salvador Parra Camacho.
---
 ChangeLog             |   2 ++
 src/phantomjs.pro     |   3 +++
 src/phantomjs_os2.ico | Bin 0 -> 5498 bytes
 src/phantomjs_os2.rc  |   1 +
 src/phantomjs_win.ico | Bin 0 -> 2238 bytes
 src/phantomjs_win.rc  |   1 +
 6 files changed, 7 insertions(+)
 create mode 100644 src/phantomjs_os2.ico
 create mode 100644 src/phantomjs_os2.rc
 create mode 100644 src/phantomjs_win.ico
 create mode 100644 src/phantomjs_win.rc

diff --git a/ChangeLog b/ChangeLog
index f07b4cfe..d6b917da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,8 @@ Version 1.1.0
 
     Fixed issue #19: option for setting the proxy (Clint Berry, Ariya Hidayat).
 
+    Fixed issue #60: Win32 and OS/2 icon files (Salvador Parra Camacho).
+
 2011-01-17: Version 1.0.0
 
     Initial launch.
diff --git a/src/phantomjs.pro b/src/phantomjs.pro
index de73d354..8848c1ee 100644
--- a/src/phantomjs.pro
+++ b/src/phantomjs.pro
@@ -8,3 +8,6 @@ QT += network webkit
 CONFIG += console
 
 include(gif/gif.pri)
+
+win32: RC_FILE = phantomjs_win.rc
+os2:   RC_FILE = phantomjs_os2.rc
diff --git a/src/phantomjs_os2.ico b/src/phantomjs_os2.ico
new file mode 100644
index 0000000000000000000000000000000000000000..86fd175d2e32e10220702cd344c2d7a6c5d70f69
GIT binary patch
literal 5498
zcmeI0YfMyE5XV=cAPQ&%8|%AK!6vpJd^BnkOG|3n*l3N!rW$S3DDhcqnkFVjTOUD8
zjcJv>R0LtGh%BP=UV-J!?xL_Oh_F10Ak;<?e8eca{p}t+xxLGx#5Cy#mwWFyGv}Q7
z&&-*bdoH1$jM8W{f&9&(_2r(T`Ajo_KYn(*Jyeco4SY5}h0&3Y@mIf>@Bq%W+gUH$
zZhM52zBAWDv>Iny(8L_(<#BuT(l+(*9j!O_v-VC8?P!N`E8FqV54m5qeZNPJqwVHa
zw>#lI<yN+K=$?Ckv;9ukY0v9vn>0h6{D+$H&bC{#)7jd0|I1&9dG+hn1K!@=0|qz~
zxYuFQJs{xYdGkID2^lhYu$w9UV|#gdty#J9WNhrg{reX!TsU&1x;zZ>_Fnkur{|NB
znrdpUUcMZ$d-t%Rj-Y(W-=YNzY*kfljg8H<wWS8bsS_u@-n8l688ZR{179C8B4qB|
zUk@F!UAc0jp`pcQyHrw=pPjvS)v6Z(_3-cr2ng`^_jmQ=n9-v%&z%!8t!8s}YU;)G
zbVF8FQBF=ydU{@FX062{Mz7b^p;$>?9&;|}bfF)7fY`p#rvwG1CMT!rbU#EyELpsG
zN^tN{e}5kzpP<Q;e~*g73S@Gbi;A)?TtF<(!kip9t@ZVCRNxlp<}#X-k->yte)?(a
z=FRKZu3fig&8ihE=FFP)ny05y6XaKxmElP)_9$PkKOG;hJ$@V^O0mX*f*#z|)biqD
zp^Wm0y)4nErRh^sO@)Q{L0)KBmY+Xq;zT9xU>_fLjX6SRWTGwTY?e~2#KqOuEEc6o
zVj8%>6<)kppx0NFl}TpxrAwDfOWA@qCrnV{(kEi2oSMo?)MhP{mAH_G>}<k@==$^8
zHRX_mU@zEuu9}Jp1fq$>WP(H=OdB#}hzfV|q)99h(8#2Z+AL8DzfxW<WL6rDO1|u~
z5TCFR#Tu%skw(;E0vwiXT(?dI3hC+T`SXuIwmDsm983m6g?r7(gpc1Oma;=^u!*3s
zL0HOlxugUV597VypdeRVIA1JT!b~9t&GC%fBf+e%szL&|Y_1Yc_OY?lIf3edu@2H;
z02g#J#a&vx6&wtZa5bW;%FBh?Qmjx0zfmP5Q`xDtS{ap2mi__vqtMV^jfLs&=SQs*
zQH?aLBe20zN+#Wq%#e~P`}p5sU1_QC8}R^%-zXyi!-u=WrC3pcNns&}wV02uq*yxa
zJFa$z%Y1f$IbsPUxCBYWu3hdx1)stz?RB73RH$6qSW`o&tCSHaBA87D1w@zNh@iS+
zHd6!p#{E1jOe_&kOjh|Bex21SB`YW61a_8)l4~y&7h^t8ULt+tQp|g`MJeB1pLZ6f
z$&8=_BAdcXWWu;{edE42d$!84?oeKYPk`Zp^punlfq{MF&X_ihsF10o6i#7Ry?vM_
zn96C&K5<1ENl8q6?lIu)sZ&W?6)q%uN?GQ0K)HkD!j0y_LS8+jRpZsGswD#5Vl;xw
ztIgM?EUV0?lnKdFZ3L2l(MOJCWoA<HPinO!BQcN=AFoSFDk&~Lf9_n&(W7LpE40;Q
zqFl#CM-Lh_NCl)K$Bi9p%+JSr0vA!Z{n(KsZEbCQDKs`VR#sLfB_{r`Z=YVTw^%H#
zt*!8@tE*#=9diwGaPbMJAd0^VNJS1CHY~$=su8#-KvZBR!r7~!prA2h#>B+L=ybZM
zs3?v`GiT1U*=&raBqtL>Qem+i*OeC)eZPIX3dNQ5^ziuY@L^f9T5Yyd@$t>g%}9=m
zixczr?%fL+9v%+KQIm5Pq}gmvJA3xVGe?2z$fJ@Hip+{-%Upq6IUB;mrP_2PF0Nj`
ze*N<0%WG?E0WunmVPRq0wr%U|>~!FoOe$R5&gN1#W=@~(isH%<sdTfY1)YVT3kwR6
z%<svQCr_U~y?y)kA6o6>$B(<ayCKC;vQ9_n;veB*p40(CB_S^Exk)5+;Iz+yr0dqL
zzgt^d>gsrx5zHcffOz!ik?zcy1Cfz=xw!(7r`2jb5go0ns2qB6@>d%+xSHmULm9u(
z)O4@26RQbn-iAP@r={iQ=ElXw;!hIxv{svN>XgA?NI83!V7}@+O-W;MGN5F)yE8_w
z&_s38$&>dwI_?YT`g)wk8!a~@gVaD1k*btmj_!mpD1sw#NoTbEcI#Hx4}o40B{MW6
zq^_#!L08xPuC80{?X3+B>@}BCK7GNIaH4}6RLJCngwdlM|DNgBZ{Waz-)z}}pC8=4
z%XPP-;}!wk)TDywl_Y~GacJHzL^;{l*Z07_eHbgCdE)ll?d>g!Bz48b1BBuW=B&h0
zbx488J$u@(UzgByFx(YRa5$?F04tU*#a${<{U!N23tzpu(qtmD*lTb*Zr*go6<bfJ
zb8_e}L?83tnL3pNaD~zMS93ELc8QB~J{N&RsBhW0@eP+x@;+p~;1H*7lJU!B%MM0H
pCTg{q#tV^e#@#!1ESNw4zd%$eMoQv*K9K$V{Jg!qRHOfM@*ibGzES`H

literal 0
HcmV?d00001

diff --git a/src/phantomjs_os2.rc b/src/phantomjs_os2.rc
new file mode 100644
index 00000000..4b90e9c2
--- /dev/null
+++ b/src/phantomjs_os2.rc
@@ -0,0 +1 @@
+ICON 1 "phantomjs_os2.ico"
\ No newline at end of file
diff --git a/src/phantomjs_win.ico b/src/phantomjs_win.ico
new file mode 100644
index 0000000000000000000000000000000000000000..cc296c747e2517896cfadd15e713eb4aa56f86fc
GIT binary patch
literal 2238
zcmc)Kt4}Li6vy#jJFiY3^g*G#L6C405+ssbMN)yR#38BU4<JF}io~IAmP9l`9*;qg
zkklZNIOMwDJ#9H~&b{WEJI!axZ`R(kX76c`N_=*9#JQrsD$=r~KfopZiE#b5qxAjC
z>+7ptUS9O$#}7R|KI-A&K~GOls#Gd^e}9*msn_eN*=%Zids~NxhuYiQ)5ph$uCK3k
zdwZ+FV4$<JGo75A=<V%IH#axBzrWYj)s@cA&vkKep@V}19UmX-=;%nNr>DBRyVF4X
zGB~umuK^4W^~o?eG$g~|(1;9!Lt`=w4o%1~IOJp)9HM*p7#!Lq!QfDz41+^MG7Jul
z$S^oGCd1&+gbag2PKLoDUDEZk_&8_nl3{SDPlmyvAsGgTF3BS@92%2haA-n?!67HZ
z;83x0<7}+o=+92T;833ogF{0y3=WORFgP?O!{E?_41+^XhQT2{v;Jo~Khyu2{$v;&
z>XTt`Xh?>^p%EDdhsI<W9GZ|}aLCCpIJlrev2y3^^e4mMP@fEgLqjqQ4vok#I5Z~1
z;LwB&gM+5@CnFpKgk31oE*S=g`eYa!8j@jfXhep=p)nZ-hbCkg9HGeohH3kKmHxv~
zsa5`AR&#r)SzK?fch+jZ4XE{^xU;s<Xm(ekDDM8eLt`V{uF}oQNt&iBaa1m6X?3wt
ztJlMz`f9wR#m)7&9K~rGs-d37)lRRy6eg}mp^}t~I$xna&CzPO!B&_VPwUg^)Z;9i
z*1}WPI^}Xw)RXvUoo9^Gg-|c8g$CiqS)3H@i$9p&t{3%%q#Pxo!l<GiC2@v$u_%{n
zRZ73qBkI-0v|j1W>&0EB_o039^bD!2b14dUj<V_fd3x&GVRfP2Ev|<8^pA{Y)HkQ)
zQfYBsXGl20Ft%*EItI<^MUQDC>dDH+eEw1vCKbD%#3{`~OsdU!eJgBEoQBuN>r2wm
z?rVJ`CR1MQR(qT6yx7Yq>3sf18f;J!x6;~X)T?*%h~dm%o$fA8>h18#^L!^QN1ddV
z6!p*L7YkU9(yY~5-bq@my!b6-)z9UXN{wp1oTYJ+^7Nd-^1s}k8+6P0GCNjmYw@PC
zm96>e!gsBc=gU0R{D_jZ+2+qiZLH*9M?~$<#mxpRRP$Dz&*n$H*{h!w!&kE%&FWFS
p{_E^8puW^jlZ>B@7QXim#p0+px0aR`8vjzAkNW=2e}(_`_#5z}k8}V4

literal 0
HcmV?d00001

diff --git a/src/phantomjs_win.rc b/src/phantomjs_win.rc
new file mode 100644
index 00000000..3381c6a0
--- /dev/null
+++ b/src/phantomjs_win.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "phantomjs_win.ico"
\ No newline at end of file