From c01ee90ef6eaf62e1ec3b10567a54a0b7c0a3977 Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Sat, 13 Oct 2012 15:31:25 +0200
Subject: [PATCH] Provide builtin defauls for treeview icons

---
 src/common/cfgfiles.c                  |   5 ++---
 src/common/xchat.h                     |   2 +-
 src/fe-gtk/maingui.c                   |   4 +++-
 src/fe-gtk/pixmaps.c                   |   7 +++++++
 src/fe-gtk/setup.c                     |   3 +++
 src/pixmaps/Makefile.am                |   6 +++++-
 src/pixmaps/channel.png                | Bin 0 -> 3444 bytes
 src/pixmaps/dialog.png                 | Bin 0 -> 1098 bytes
 src/pixmaps/pixmaps-xp.vcxproj         |   4 ++++
 src/pixmaps/pixmaps-xp.vcxproj.filters |  12 ++++++++++++
 src/pixmaps/pixmaps.vcxproj            |   4 ++++
 src/pixmaps/pixmaps.vcxproj.filters    |  12 ++++++++++++
 src/pixmaps/server.png                 | Bin 0 -> 927 bytes
 src/pixmaps/util.png                   | Bin 0 -> 919 bytes
 win32/hexchat-xp.props                 |   2 +-
 win32/hexchat.props                    |   2 +-
 16 files changed, 55 insertions(+), 8 deletions(-)
 create mode 100644 src/pixmaps/channel.png
 create mode 100644 src/pixmaps/dialog.png
 create mode 100644 src/pixmaps/server.png
 create mode 100644 src/pixmaps/util.png

diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index 3085168c..e8b598fc 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -562,9 +562,7 @@ const struct prefs vars[] = {
 
 	{"tab_chans", P_OFFINT (tabchannels), TYPE_BOOL},
 	{"tab_dialogs", P_OFFINT (privmsgtab), TYPE_BOOL},
-#ifdef WIN32
 	{"tab_icons", P_OFFINT (tab_icons), TYPE_BOOL},
-#endif
 	{"tab_layout", P_OFFINT (tab_layout), TYPE_INT},
 	{"tab_new_to_front", P_OFFINT (newtabstofront), TYPE_INT},
 	{"tab_notices", P_OFFINT (notices_tabs), TYPE_BOOL},
@@ -690,6 +688,7 @@ load_config (void)
 	prefs.text_stripcolor_topic = 1;
 	prefs.tabchannels = 1;
 	prefs.tab_layout = 2;	/* 0=Tabs 1=Reserved 2=Tree */
+	prefs.tab_icons = 1;
 	prefs.tab_sort = 1;
 	prefs.paned_userlist = 1;
 	prefs.newtabstofront = 2;
@@ -732,7 +731,7 @@ load_config (void)
 	prefs.gui_chanlist_maxusers = 9999;
 	prefs.gui_chanlist_minusers = 5;
 	prefs.gui_tray = 1;
-	prefs.gui_pane_left_size = 100;
+	prefs.gui_pane_left_size = 128;		/* with treeview icons we need a bit bigger space */
 	prefs.gui_pane_right_size = 100;
 	prefs.gui_pane_right_size_min = 80;
 	prefs.mainwindow_save = 1;
diff --git a/src/common/xchat.h b/src/common/xchat.h
index 6f82ed76..7767d709 100644
--- a/src/common/xchat.h
+++ b/src/common/xchat.h
@@ -205,6 +205,7 @@ struct xchatprefs
 	char dcc_ip_str[DOMAINLEN + 1];
 
 	unsigned int tab_small;
+	unsigned int tab_icons;
 	unsigned int tab_sort;
 	unsigned int mainwindow_save;
 	unsigned int perc_color;
@@ -312,7 +313,6 @@ struct xchatprefs
 #ifdef WIN32
 	unsigned int identd;
 	unsigned int emoticons;
-	unsigned int tab_icons;
 #endif
 
 	unsigned int ctcp_number_limit;	/*flood */
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index 41cbb2a6..3dbac7af 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -2915,8 +2915,10 @@ mg_create_tabs (session_gui *gui)
 
 	/* if any one of these PNGs exist, the chanview will create
 	 * the extra column for icons. */
-	if (pix_channel || pix_dialog || pix_server || pix_util)
+	if (prefs.tab_icons && (pix_channel || pix_dialog || pix_server || pix_util))
+	{
 		use_icons = TRUE;
+	}
 
 	gui->chanview = chanview_new (prefs.tab_layout, prefs.truncchans,
 											prefs.tab_sort, use_icons,
diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c
index c802f508..4211c6f5 100644
--- a/src/fe-gtk/pixmaps.c
+++ b/src/fe-gtk/pixmaps.c
@@ -137,9 +137,16 @@ pixmaps_init (void)
 	pix_tray_hilight = load_pixmap ("highlight", trayhilightpng, 1);
 	pix_tray_file = load_pixmap ("fileoffer", trayfilepng, 1);
 
+#if 0
 	/* treeview icons, no defaults, load from disk only */
 	pix_channel = load_pixmap ("channel", NULL, 0);
 	pix_dialog = load_pixmap ("dialog", NULL, 0);
 	pix_server = load_pixmap ("server", NULL, 0);
 	pix_util = load_pixmap ("util", NULL, 0);
+#endif
+	/* provide inline defaults for these coz they are nice! */
+	pix_channel = load_pixmap ("channel", channelpng, 1);
+	pix_dialog = load_pixmap ("dialog", dialogpng, 1);
+	pix_server = load_pixmap ("server", serverpng, 1);
+	pix_util = load_pixmap ("util", utilpng, 1);
 }
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index 60a17a0c..742eb0b3 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -266,6 +266,7 @@ static const setting tabs_settings[] =
 	{ST_TOGGLE, N_("Open an extra tab for server notices"), P_OFFINTNL(notices_tabs), 0, 0, 0},
 	{ST_TOGGLE, N_("Open a new tab when you receive a private message"), P_OFFINTNL(autodialog), 0, 0, 0},
 	{ST_TOGGLE, N_("Sort tabs in alphabetical order"), P_OFFINTNL(tab_sort), 0, 0, 0},
+	{ST_TOGGLE, N_("Show icons in tree view"), P_OFFINTNL(tab_icons), 0, 0, 0},
 	{ST_TOGGLE, N_("Smaller text"), P_OFFINTNL(tab_small), 0, 0, 0},
 #if 0
 	{ST_MENU,	N_("Focus new tabs:"), P_OFFINTNL(newtabstofront), 0, focusnewtabsmenu, 0},
@@ -2147,6 +2148,8 @@ setup_apply (struct xchatprefs *pr)
 		noapply = TRUE;
 	if (DIFF (truncchans))
 		noapply = TRUE;
+	if (DIFF (tab_icons))
+		noapply = TRUE;
 	if (DIFF (tab_layout))
 		do_layout = TRUE;
 
diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am
index 6dff376c..65f8cb89 100644
--- a/src/pixmaps/Makefile.am
+++ b/src/pixmaps/Makefile.am
@@ -9,9 +9,13 @@ LIST =	traymsgpng $(srcdir)/message.png \
 			purplepng $(srcdir)/purple.png \
 			redpng $(srcdir)/red.png \
 			voicepng $(srcdir)/voice.png \
+			channelpng $(srcdir)/channel.png \
+			dialogpng $(srcdir)/dialog.png \
+			serverpng $(srcdir)/server.png \
+			utilpng $(srcdir)/util.png \
 			hexchatpng $(srcdir)/../../hexchat.png
 
-PNGS = message.png highlight.png fileoffer.png book.png hop.png op.png purple.png red.png voice.png
+PNGS = message.png highlight.png fileoffer.png book.png hop.png op.png purple.png red.png voice.png channel.png dialog.png server.png util.png
 noinst_HEADERS = inline_pngs.h
 CLEANFILES = $(noinst_HEADERS)
 EXTRA_DIST = $(PNGS)
diff --git a/src/pixmaps/channel.png b/src/pixmaps/channel.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2d6c9ebef2713ae14a53a437c7c69d9264691b0
GIT binary patch
literal 3444
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
WRuWkr-f{f^0000<MNUMnLSTYljbp<A

literal 0
HcmV?d00001

diff --git a/src/pixmaps/dialog.png b/src/pixmaps/dialog.png
new file mode 100644
index 0000000000000000000000000000000000000000..54bd3a0f3636df3ea3d41b782ed895cbba6ce8a6
GIT binary patch
literal 1098
zcmV-Q1hxB#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkPFKI(VP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-pOwy-LGS97oS>
zMZqD61UKR0ATHv^)-h>I5gck1NwPJ`rHVGW++068`4T>agNvh}Z%}a%oO}c~K^z<$
zB4lt7!84uz8UFmBvEp_7ZetEcxivx0mthpknMbB+0>B_Gwb$=&1LQ@n_`&-#0^n)Y
z>-b&%#%!vM1wMhzOqD5!bs#&l+Jd+Q+~i1G5LbX}_JTHuJHQ!MJ^`Gh@)y7{VHAUS
z1>9j6#n1q7lgeGdwd&jgv<p2phr<IaH(ITh^s*vRa(7%>H7ey+o)$(IW?)qYRQsyk
zp4P`o20fquC5&QO+1m~R5DSyK)ubop^jn2^`2DVbjPJn<VCuGR`yX(<28+$QEib|R
z1>EQ_@xV|$`ith~00004XF*Lt007wQ^&Awc0000WV@Og>004R=004l4008tQ004y1
z003=Y008K0002CT000|UgXaf$0007oNkl<Zc-oATy-yQy9LAq}zqWVRUR$6ieSs>0
z#3-nU!5EDpCJwGnE-t2nOvIQN<Del93_7At{sSg1E*g!nxR_uFVh~G9X~Rn?T+7k+
zUVjcoBG@R;{K=Eg_sN$cgy3M5aE8;mJ0JRF<whyH%y9z$s$Q+#)ytEOgDi~}3CFbu
zcOKomH#9Ps^a!+o8XS$pwTV_Nb<jWwXQ)J9&kyxTTe`TggssvlL|K8<7F(}w>ZwY8
z-29Vg|59RTw!E??EPq=74S<uQU_vQaLew8fi2?xgpC{<$N!zxXd4{IJ`V{y&dJ#yR
zhSGgzwJ>$9cBl<lo}H4yA#idOTqp@iizAj+KDT097C5H$Qf`YhL`4O72|h)DPjp@!
zYQ*1(#BP7^$BteOribAf#V_-3ub(=!f!Z<J#Yi0*%L!n2^Uw>6K_#5&{jY(fW-f6&
zH^u}aSLM_IA53%sAgC5{FpBez*Q~vFt=%W^+;{rsbF#1C<oU<rXGezbzj-|i&^%bb
z3ZL2zil))fD}ZCdv1;&415S10X{9(ZwpSpBZbi~V=Vp>8`V+a_4j55_2N90P!1Dm&
z5_q-^*D~N)2JEd|zFwNWpqHPOSODMy!Pt6*Z^x>Mfhz-OniO^nfKUJk;8+A^-9cl=
zMt!>qniaI>#$pOUi3R}EtR3Thvf!9axDa659yrd0$hi=C7XitG8l@5I^20UqAhs#E
z6m@*>l^go<Lap#=x@n{av#}n(s)a!_6g>Rehkybh6!f)i=qumrRwXx6-^zX6HzGw{
zWC1$K%bmmF?!JDhJ)Y$Jib^vK<(Q4y?&f-NGdnletYkj|?h+x>9sv9t0ANQFs(xFO
Q`v3p{07*qoM6N<$f-W@Y{{R30

literal 0
HcmV?d00001

diff --git a/src/pixmaps/pixmaps-xp.vcxproj b/src/pixmaps/pixmaps-xp.vcxproj
index 24e63fd1..2a3a8a6b 100644
--- a/src/pixmaps/pixmaps-xp.vcxproj
+++ b/src/pixmaps/pixmaps-xp.vcxproj
@@ -96,6 +96,8 @@
   <ItemGroup>
     <None Include="..\..\hexchat.png" />
     <None Include="book.png" />
+    <None Include="channel.png" />
+    <None Include="dialog.png" />
     <None Include="fileoffer.png" />
     <None Include="highlight.png" />
     <None Include="hop.png" />
@@ -103,6 +105,8 @@
     <None Include="op.png" />
     <None Include="purple.png" />
     <None Include="red.png" />
+    <None Include="server.png" />
+    <None Include="util.png" />
     <None Include="voice.png" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/pixmaps/pixmaps-xp.vcxproj.filters b/src/pixmaps/pixmaps-xp.vcxproj.filters
index 5944362a..82b5ddef 100644
--- a/src/pixmaps/pixmaps-xp.vcxproj.filters
+++ b/src/pixmaps/pixmaps-xp.vcxproj.filters
@@ -37,5 +37,17 @@
     <None Include="..\..\hexchat.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="channel.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="dialog.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="server.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="util.png">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/pixmaps/pixmaps.vcxproj b/src/pixmaps/pixmaps.vcxproj
index 84f89609..812fa805 100644
--- a/src/pixmaps/pixmaps.vcxproj
+++ b/src/pixmaps/pixmaps.vcxproj
@@ -93,6 +93,8 @@
   <ItemGroup>
     <None Include="..\..\hexchat.png" />
     <None Include="book.png" />
+    <None Include="channel.png" />
+    <None Include="dialog.png" />
     <None Include="fileoffer.png" />
     <None Include="highlight.png" />
     <None Include="hop.png" />
@@ -100,6 +102,8 @@
     <None Include="op.png" />
     <None Include="purple.png" />
     <None Include="red.png" />
+    <None Include="server.png" />
+    <None Include="util.png" />
     <None Include="voice.png" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/pixmaps/pixmaps.vcxproj.filters b/src/pixmaps/pixmaps.vcxproj.filters
index 5944362a..82b5ddef 100644
--- a/src/pixmaps/pixmaps.vcxproj.filters
+++ b/src/pixmaps/pixmaps.vcxproj.filters
@@ -37,5 +37,17 @@
     <None Include="..\..\hexchat.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="channel.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="dialog.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="server.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="util.png">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/pixmaps/server.png b/src/pixmaps/server.png
new file mode 100644
index 0000000000000000000000000000000000000000..24b4ed98eb13cc81c943a13f96bee1e77b569609
GIT binary patch
literal 927
zcmV;Q17Q4#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV000AKNkl<ZIE_`4
zTWnKx0LFj+bJ=NodQRJQ8@Dn*f`e=%sDX(Zxws`}^NFAn5+FVpW8x(~5TC>ZU(on~
zk{FGb7{yFN%t%bUumq+NiHwAaK*nX*-MU+COV_ohJ(s@^W@LWP-}ig?lAn-LvNTQc
z1CKwpyY;{$?VGmOH`z(o4dm2#cJ9ih;a@KQcI&I$!Z%lz_QfK=5IxaHcddW_xkFtq
zHm_|~RH5Se5<dtKia<)A^qsp-?`Pj19~zuGQj_1h_W_1@-rUvQ(zoY8S0{mru7Mpj
z$mJ_kT_4Z)5ePJ0LkOSVPy2fR_;uo7P4;>Uz=pQOv2D8_>KsjHn46uVF`+SEyho*6
zWPE&*6%BRlXkU$2oo8%pnjO!y?_0e#d>BAjde4@p_H7=tY+Gx2U?r^^n;E!p4c7}0
z0+u%=c%r?9O%JX@Q&iqP(MLAFz)U7n9Qf{bn_?!F{qqa++T8RsZ5vl|^{-n@WTu#z
zon>rnl9;7qMsyS*NY-0)b!=fYJxVR8+7VmsQO#t_5l>c|8xm2nxdH<hhVWdMh0+4$
zN`>yutxRUJTpYYXYE>htl@0vZ|2yfi43)A|(n?OTQOVbs4%JaAS8ys0NQv)DHn*;$
zW9P%DnnEr&PcC0%=<02zXR=hQRea&C&}yFave_)E0&ncykEUsS^!XWr0P^`FH-^(J
zYf2E0S(GadCq6mNosl$t;8AsSSE)1XG1D|DmmRimYvZ+-_VV7*mr2ATTpzwm&kJw!
z#mOItnjtP;y2h11Z=z``iV&!JWJD2~bv6`^qN*CF&zvVfvSED+MNu&$VN_LPVsZ}G
z_bC)gq*g6M*L93g7_|6VRY~srI~?*3M#H)}k;$^Ac{yL7>SuB)PdpwY5{Y0K25Xv^
zaq?6@_lhNCAgM`XxJ=VwA*IA_d*x8du70TtA0uQCi^Z^Q8^bUVLi~4_?=mqth3D3A
zYC$kwvbsyxKK$vv3(2jozqKyT(WZn=JRZZ2#R!MP0630Ap-`YyERvbac_a6<R|}Vq
ze+-~3TJ_K12k+djn$H%bem!c%XsoX%Zdt@Fi^lqTEX!urRW99hV_l2m|Jk@0<>_N)
z(o{N9iSUzlNKXN>P^qOS3eNdlNuHBGzv(XR{|o*Qh3qKd;uin_002ovPDHLkV1ns?
Bwmbj;

literal 0
HcmV?d00001

diff --git a/src/pixmaps/util.png b/src/pixmaps/util.png
new file mode 100644
index 0000000000000000000000000000000000000000..daa8770233d1034d4af78f99fa97f939c7ee7b89
GIT binary patch
literal 919
zcmV;I18Dq-P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV000ACNkl<ZIE`hK
zTWDJa0EWMF=}At`X;0G2wuWh2>q=u=l~rkRY~Y|4S8ytuB{<>`v?7#QFT)MTCW4y?
ztN60@p~DM4R798{Zpsulp`y--t1VsIq;0ykrnjWY$>p3R#|Pc0?0@|E|NrUx1;=sN
zD7VmEac|?MCz~Fue{{3IyasUoo?n?6xfcF@YCLv6>kO@K%nKU_?x}s@x$fs5JF&g(
zfm+q01H!){9L#iz--oY7hR%I^EHXRz*&PGT%`cw_^*(jn=dC1f+uZU60c^W~;|P=)
z8mlWY2K&D_Iy!dtB!CD|y(tvz+`r?vuDU2%Nutr4#9}dGu^997izrf_XSxE!7UxN4
zY`TIw-`!GiU>|^}3PGc(ZR^RDnI;^brnSY7BIlW%onv8P5!*@=+TX?>BVi^cr<sdJ
z$>c1W+We<fAy_J^y3>WLSQDL@<@#SY=s)u%Pj@|p<`J2gjNn!rJgSR^dOxr9JWfw&
zH<8H*qDQD#J;hE*^96b(ccC?Hn%I`b@@kx)e;wmc&tAqSX4v<{4rEzkJ!vvMv%u?b
zogtkzNtr2<iS&}7Rd#)CR7rbEH4T@`jiM-IvKF;>Z{h6eK6G6r^wKHD#%ItxE<{nl
zwk<5%V(Dh)yo9?Un8~g+<ZX*Wp+Gj9!|hTy^6Ik$8fz&Oi^#IX$mkUDL=wx&kxZtD
z$JfYZ#WA@=(IO>^g)B)}b{++hV~0cR>1gN8w+ArFG>-Hgpt0dDdS5%u)bt#p@E-%R
z8kQ7qdx@&%gGz~r+vVoy8wUw>ck=PjMF!4&#rQ;&ZS`B(*?vEPKpj_x|0I{Q5G5I_
zSow~eSB&qFt?QzgX}Pblj)%7g_~z0t41RKf>gvrnMThr4{G5ED$Rlk{G;XV5cx@e9
za9u69ygvwz<DfSm+U?iPi)E@Pw=~tWvX%xUbX`Lb1X3xJeBQ!msEm$<F>`rq&h&Pe
zBOhG8jk3|&cd*VV43z7tQdL!fuiS^KstAHWE}JDDkF&hAOf0^h4X-ONCVuPx^ft->
ziL3n|O<1L!2}%9QQ(8u)uN<#lilJ##c)h5)&I+!}H*8<Wt@0gj1Q0vl6Acf${9bjJ
t;Zf=UC!V$<^NH+_i8NQ73y1$#_y^1)b}ceDk~aVV002ovPDHLkV1nDEzGVOa

literal 0
HcmV?d00001

diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props
index 1f2a3c39..d4ca94ee 100644
--- a/win32/hexchat-xp.props
+++ b/win32/hexchat-xp.props
@@ -33,7 +33,7 @@
     <PythonOutput>hcpython</PythonOutput>
     <Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib>
     <Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk>
-    <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>
+    <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>
     <DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;intl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>
     <HexChatBuild>$(SolutionDir)build-xp</HexChatBuild>
     <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>
diff --git a/win32/hexchat.props b/win32/hexchat.props
index 890dfd01..749dce0a 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -35,7 +35,7 @@
     <PythonOutput>hcpython</PythonOutput>
     <Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib>
     <Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk>
-    <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>
+    <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>
     <DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;libintl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>
     <HexChatBuild>$(SolutionDir)build</HexChatBuild>
     <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>