From 834fdfe9b3da8c0a030e93baa05b39656ef0a8a3 Mon Sep 17 00:00:00 2001
From: mathiasdm <mathiasdm@mail.i2p>
Date: Mon, 13 Apr 2009 17:27:35 +0000
Subject: [PATCH]     * Bugfix on tray icon updating     * Some more work on
 the general configuration menu       (currently not added to the tray icon
 menu yet, needs more work)     * Tweaked the desktopgui logo

---
 .../desktopgui/resources/logo/logo_green.jpg  | Bin 1328 -> 1309 bytes
 .../desktopgui/resources/logo/logo_orange.jpg | Bin 1302 -> 1289 bytes
 .../desktopgui/resources/logo/logo_red.jpg    | Bin 1233 -> 1312 bytes
 .../desktopgui/src/desktopgui/GUIVersion.java |   2 +-
 .../src/gui/GeneralConfiguration.form         | 104 ++++++++++++++----
 .../src/gui/GeneralConfiguration.java         |  84 ++++++++++----
 apps/desktopgui/src/gui/Tray.java             |  20 ++--
 .../resources/GeneralConfiguration.properties |   3 +
 .../src/router/configuration/PeerHelper.java  |   4 +-
 history.txt                                   |   6 +
 10 files changed, 171 insertions(+), 52 deletions(-)

diff --git a/apps/desktopgui/desktopgui/resources/logo/logo_green.jpg b/apps/desktopgui/desktopgui/resources/logo/logo_green.jpg
index 9a29b6d1c3e10d658683a91c89fcfe106e538028..d558efcea3a319fdea21fd624fe5b72813d37918 100644
GIT binary patch
delta 1144
zcmV-;1c&>u3Y`j&w0{`@00IL600000000000000000#sJ3I+ef04xvy0R#g80ssUA
z2LJ#7000050s{mF0S5>G2@(_)85SB>SXq&lnA6tR|HJ?l0RaI3000000000000000
z00s&F!~h==00RL50RRF60RR91000000s{mE0R{&W0234y|9{#53<CiG0ucid06ze{
znv0-y+3q*&UF3U%_(IRJHD%6;MAU=DayGh+U4TmT>9!;sw+tE<NfRO}(1$#IP#Y)>
zMZTN#SC0w$mI_2*a$SXZ>iuucy^ZVVhR0)i>52PCTu85S?vEH~ELUkZOWky_mdC=L
znDAyqrdex-D}P0YMY4`O+$WZp!<u!;-2VVn-7E`{xi{Dj_&Em#7f`y;n66jy@}pwM
za5&AFJy;{M8)^4rLzrG%b(EOX54!+E1Sg@Fa~CMgpI2K?S#PeWKhix<(XcQ5p|b0j
zdbXm|f_2W!fEtFxI-R0jn6q|Sz(`So#CDeinED+^MSr$bI_+*zrC4lso4v0it8+)i
z>1paq@k`t84Z9RkrrWY_bns{M8gF&K9ZcHMx%CI9*wTtH&BMoJh^|B_Jw*UajlYv$
z#c643P4Qg}_U7G+DAaA)SGf@9{{W9ax!;bX+R?U(L(=Q%MHuGdWE_dAM6E=M7EF<!
zl#aL3n}1pTSudlU_4Dh>#iJ^F6i&Xjoo|ygtR_=tn+hqGtFocSckxsP$P1Rj8L+Y$
z(D9|rjTKXuJ;XwC;{DkDH~#<(YTx!@tH0CyK>FPErDg9OHDfJ5q%4}>RaEy|Fl;)q
z014-Z9W4T@Uz+`}a$dL%t_-z22>godBQvVTB!7)zw79&GhU<d-(J$G@*SGEJt^A$;
z04IsQJM#YkHS6SaYt6Mx%hFm&b^5)0jSuQ%&#etS#p`+h08dPb0|Ez!SD*VC#rN-b
z1bZ@1kG#jtI@vtg^KDx)^p=ucUZ-0o{#41GRP8*~>iPcwPfV!-0tbgzpZ7iieeU{?
zW`D?feWDUYJm$Vf4{&32yB(}e<kfk-bGus~I@k^g!C}oQDCk7E%z>k<XCXswJB-F=
zF-eUjkAc-=$r{(%S*=fU4X`!O6L6hM<Ow8_9>OnQZyZk_g2JZ+CGz=^(9gAu%MwO(
z2XdyBpO=*CQ<UXcRu2yttH}98(+x@U9)EdM=8{i3h2rL|@EWN*R8cf$<0U27*4DB?
zFQH2q@$VXBeP+KU<r4U*Pnq+|r!<y%)Grq_9|5Y9wMP?1ZZc9`jb&>j68aRd-aX??
zkFCus?;Cz|m;%*pBh1`mu4~6lF2q<!3MT4AS*Di;7{!orGWYzYrR6{$3N}*O&~ewn
z9T~%TTAW(kznL$&KT0`2`WtY6-Ml<JQ<qg(&`p<*OY(DM5?q<tu4FLE1kcz(Jd%>9
zND~;w5Upd*nVEN=V()sRHmY%<pEDkZ<z~nv66fZ*ki#$$lL#l0Qc@Bm!!{7DW6qh8
Kcb{VKd;i&xs0&j7

delta 1164
zcmV;71ateH3a|>0w0{}^00II700000000000000000svM1qcfN!~iD{00IL50s;X8
z1Oos7000001O)>I2LcEI2>=upSP>E!))|(U|HJ?o0RRI50RR91000000000000jmK
z2nzqi03#6q0s{d60RsgA00000000031Of#H0TTxZ5dabt6@MWY|Jncy0|5X65d#qb
zKLCnScSmw_f_Ixqu4Ccp`Y&AjU9I)&CC@X8<;9B|T56qwiCe8bvL;@Ane)~u{_ir+
zb^Br@qa1+|d>4ma{Uu`-SFD|l?b8m(5!Sxl(6ICthh1)6*xK6+RQq@AtcAk(9SOw>
z>NT0YoCem2n18h4IS169$y!h0M<~~~xx-+L+Vm6E-O8`l%s<*b;c?+133LAdVtue>
z8rXiTgzujoc6O4dSb%{5XUrMxHnxdtkTjerfK@9_3|ex5Xr+-7pR2pwcW%=!9k|@L
z+@{UiP3?1f262fg&_RmXk>eEW12*ibYO`r<91an4c7GMYErEyTywu@qD8;{<Xg0y4
zU*whuUSO$^$9mam-%hC^nV@MZ+C4Jq-MghWy3aF`vqp}WiZjaEnoPn$yw+-L-iYF5
zt$>jT-<4En&;9qO6qWc-UhaR)C?S*0xm{C3tXUlc`m=3q@|eqN`U);2*D9%~GH5TL
z*=y}=V1F2$OMoCkxzed#O=zimYxW4w9Cz9RupYiy`um>gYV-XV>hxDS?T!P;`&5}1
z2O}*)$Vz_<;kegSueD22vMXHa*nd`__@E$vHm&|vy?*{iqyGR+(|@G=qEB6ZzwF)B
z>-C$HzRcb8yfsH*O<!=tYgOMY1h=_KOV1mXZ+{W_w#X7CvKE@a3Kiuvp<3ZnA`qJL
z9gjaSgeOj)#s0MZJYk>mS`YRA0FEBw(e|I1)b}iG_2}>DE$@@FOVS>9CMwiqDp}N{
zs5b7aLWT9f=ldfL$1B887!M#f15PV+PoC&d_F<CPlN@}$j9M(!?v}pQA4Fx`SSstj
z%6~aiS8LDeH72DE9q6aaLk`m+`ugYq@?Ej9IIAJDmx<#{D|ae!`6gm*M@6%hchG93
z(5j@??^i=lTGZQh$sEeLth3q6XqiJIpSu+1q#mhhl9$YYMUo}TZ&<q5omjxQ=iPe4
zsFvkiOyaK7P06TLiyGc60wHnyKzNY=EPun|a`MUm&jXbof<h#LX7SDmq>qvC`GiNN
z(g|l07J}?)*m-|FLEAqCp7Sm>4f%kJ91}iO1SN~+g#3$)VV}t181i)sSEve(pdBUn
zk+Sms#UWf+jY|(Y!%W|ryjkE{^ClrGUpxuqSVIK<MF_)=`Tk#-<jIPz<$2u~Gk>p~
z(r0F(&+14iiHvkefdE5tmRA?82!@0LwQy4~mJVggAOQ~~+@Tf@5xsmq9|kttZ?b0|
zX@^^4enYg`h{GqJdCqobIi)g^edjsPx^kC(InI3l06v7c>y|AU+XmTr)@RZ%+lMPn
eFi!KF=?uZ=GM0VkInK<Jl)KJzp9Me9um9QjxEx*p

diff --git a/apps/desktopgui/desktopgui/resources/logo/logo_orange.jpg b/apps/desktopgui/desktopgui/resources/logo/logo_orange.jpg
index 137a25e7a033e632799ebb118a73c3044fedc0ee..d131f21b6297f0955632ab353844db0c4a8c587f 100644
GIT binary patch
delta 1124
zcmV-q1e^Po3W*Akw0{`@00IL600000000000000000;yJ3I+ef04xvy0R#g80RaRH
z00000000050|W*K0RjjK01^`!R}>W*BUzP}nAFwR|HJ?o0RRF6000000000000000
z00syE1PTAd03;Cr0s{a70R#dA00000000020|5jD1`-hm6MqyT02K%#B>&m~3<CiG
z0ucid06zd`DgKGB4ROz6U9uhy;Q3XRSxak(RYJgjCRfa(V@OY)8*W70wTQ59NEQ(k
z6fwks5%?kxCYK$geawhP3us-1jmR=Y@z#}}HTE};&L3xs?wo&US1SbN+C)jftk#4}
zC$X~Sbrv=HNPjSV&Ic)vn2Z@7&Q3JiY*$z4Oj6$j;CP<u5PW&b-a;>v1Cl!KD<rKN
zMI%bBvwbA9Gx?SUi-lRrNV;&)dxGxTs%iUnu9p}Ixk72SUo5ho-5(XUg=Ky9WRs*i
zyQ3J+`$EYNK8@1U=!){rW+o8PltxVEN?lnyxYLLL7Jur)S{WH%!-UIUFaZ;ANm&Gv
zQ#_S!GA@JQX<fFi0W-@;wH{U<XExib)~))`+rEnje$}R&>fX4uuC9G30kEiCF*Eh|
zqFj@W<<KuzW<5NvTz-P<RnOa@OG4(7x1YsuZqcogT7tn?8Ch&Qdb_%g?NZEJ3f4Rk
zjKVn{=zsfBTD{LkZ@?Zsq%@RX#2a2p4eQCYt5*8S-LPzNIP<nG71mb87oy#vs!{|*
z>=_4d8?)K|<Q379j~B%&!|&mR2K}p1ztQ?$d};W`lXvAiB`o)(Bvq|h5V}xhA*<NO
zpU4LrD#|M#cD%H9t4u}5MoO0ieZ+N<myvT0M}Id@-fy$^YHlw&K=?6mAIV|gni~Fp
ztGpKn)y<rt*T!+4edVavV{YXOab>Dyl{J(>mF+sR2dco<;aL*~N+pBir1f)8`1i;8
z133Q9X)jkM<;1$52%)8q@M<=;TWTY1uCR)lH{{CGm1cyJLc0Y_0Axus8ya~zf22U|
ze}AVDaGG%G9IQ;}$Q0}Q!6t7dVHq44Aiv%8E~__CVEGZ&Oq(@T22I-*e2PuA(S7yI
zs>jMHs*+?H#jZHFhhlR;I3=KS<6!r;UJt=>Pr;J+7<JJO5yoAKAo+^9-7WKkT`i3>
zuG@Q9JsymchlsaSHRI(0)+PLN4Elmq`hUEdKFJDVRn??T9+Ey7L~;G5XYqVKSIP-D
zkX(~|lYC3(B(^kVS3Szfs?V0Wvms->WiGk<(0!1wQF&Mh#nD9h%jhm<0A?*kb7vdZ
zG3f!l<YmPKgk8I~dTB;1hHn1=f2=wI;+iRzBbhe#65TX$qkVS5SW{&;-tqfO-Cg7I
zzmz{h+u!b<k4K|SmpX+C^(eKps;FiaTB8cJb-@&wLeiN9gb@)G^%(L~Ge2`P_%Wps
qr*+r#qxKi9ke!Q{zt?T%FrX53iyq^ePy!(YW>W$pF+L(9KmXZ{0`EWo

delta 1137
zcmV-%1djWO3YH3xw0{}^00II700000000000000000svM1qcfN!~iJ}00IL50s;X7
z1qA>A000001O)>I2LcEH0SOcq5)&91S6G&p)z<&S02l!P0|5a5000000000000006
z2nhrQ|HJ?y5dZ=M0RRC60|5X40000000RU80tE&W2N4n!0DlM}75~}*3<CiG0ucid
z06zeL689f$afNqpMX%(7X_^mSyG^U$8CHLt*R9N0T2xhEQR}t0b|l~(WP0&}pSw)5
z-2K*~OfjgE7sYsJJ@J)<Sx&X~8@5OGB#yau%8QC3vpMUi9fq!-jUR0M6|neTL!!5$
z+{UstvVzvl6MqJA&Oy~zl2;UZQ_3~%t}wrh#1Ma3Hp<6b@lTU|s^7vw6HvZE`%uS%
z=zgb!?;ad(e449Tf^k7*%qi^lmT9ZdGMqU;S1UdY8S;T>rB4#C#$DpQwCOi)*X_H$
zTV(9+>b<oOJH^#s!iv?C<FyCun=z*=&SihV(HAy8ynijIK|P>oXw|f$-wd*t`$N9T
zEGFCGana;GXVafgacRxrG@foRNV=O&bY|-`xxQ0LEKGP+n9j<@=2H&WRn%!cQPj(7
zfh&=(BFSFU<n}s_bv~2l$8oJ~{gqnK*1$ViD&UWrLw}?}&23p^68@IALeX-0zI6oT
zk|r}u-G3;zjfU&46;G9({4>ZM_GFwR0kYtk{*bbTp_+m_je5la#C@zpi^Jx}OtBEB
z(<rVL<se!4)a+|lxpFVElpP4<!|u_)be@HOQ0V^vv~+*?-ze+j-=Vf%<=}R2ZhIwk
z&#@I-`HSuNwQ|4p;@ey$rsvJcwu<=6R0)&Vihoe}6krn0i)w*Xs6uPX1`>WqVsx+i
zY3rBp1}FY1qJN?AxAqk;)qZQIo?zVm;P-H~w^Y+l(rBJkS;*K}*UCqxH*uHHBfGCl
z{{W(4=yLFqGzshmsB6`E5VxUje#mqj>~urh$R;+<W;0ps`kOJ*5%(*7T4}e>2anRk
zbAKB$@d${CbYE?<7%*k5Dp>wTBJqrP`t81;c2Sy}Q_!r$-7nR0=(Tbyw~L9Vu4rYl
z-jZcp*4b>uvrwgpFP#i)NzYcexk~0hLrD_tKdn7-&uk#us5k~EN46{CUlo>mepN)Q
z*jI5pIoF-U7fDcr$WA7JQ6QJ-a%1#JWPi>y-nqjxoH-sIBctg$AuQTr-`X0F`9AWa
z)q0CN=3HtU?SiL)Gv!o5Se|O%$hgKEdybW?IG4b}A=YS^xg=>XAJb;}so3gxk9I}%
zjbO<E;$(ziek)Vpa$L3cC9P?7p=MdWRGg~zU!PJlbOy7T(WvNEL^Sl}xg=15A!@Np
zE5I%YhI53ucyk{t9LkhX0w0{bp%xAiyZCr{&1trtV6D2#4mNxF4%0>>3>xzh6LOf=
zxe0lQi1}XDpJ<5p{(f&+Ws?AvO>io(EAR^I2w(td6EhSLMOqAXiJ6~`D-rKA{QUpf
D$l()Z

diff --git a/apps/desktopgui/desktopgui/resources/logo/logo_red.jpg b/apps/desktopgui/desktopgui/resources/logo/logo_red.jpg
index 1da898381264bae953ddc628254788cbd4137433..c1a60b8bbe680066069f5db62318055542c75958 100644
GIT binary patch
delta 1144
zcmV-;1c&?437`s)w|@Zz0RR910000000000000ID2nh-V|HJ?)5C8!L0s;X62L%8C
z0000000jdC1_uHN0SN#U5)~F18dsNDnAO(U|HJ?p0RRF60RR91000000000000syH
z1O*BI!~i1^00IL600IL50s{a5000000s{dA1qKlk00$EY6n_;WG5^{C3<CiG0ucid
z06ze0s13ub2x(^SUKSr;-FVC_%HBytLullg=~YB7FaYJi^2EU5If4OVt1d(gR17I|
zLEAlgF+#=Kw~oJ&Bk#l>GI_K<Soe*<s&%J!`sUDQEH*}rGjG;T($p<%k4a;J)vl(N
zG$KyAQ0S|cxqlBf+6Ht1xJ<2pxp=4U7!Y)zd<U#7>R+U-#E$5mrS@g928E#_D;saE
zL7=fkl}R2YGwD0ah%{hAswk=|;xQ-Acrzqbmnx8H7ZPlP7VccLO$8VIL)lcm!)_G6
zYPSn$lCZb7(F<pXq3Ll@D`lwok2u$o<fR78%QA`aS$~E_I2&`JD`*(GYtT{1iq01*
zOvK>30Wnq2FG|yckn_<pG+iXy6zsJru5_2HaW)FmtQnpAmVj4QjZu%;e~B@35gvYa
zYq#Sta_#>BB1wNv)o&k@73gF1c-h)In>BiiTo*B=kzWTpCc0C}^SD-9Yj3IOTt%O2
z{DSG(4}Wu!`CJj*pSzN)7TI;QAFa7H8ymC+)#psP(d}+Pc2ig3GnBN8791gy8M9`O
zL8p?R5VB^-Mh+D~e+H5&<+CMhtLE#|r|9KNe%-ZW_@5&G091WO%sVZoCPo(7<5fLV
z0=pP7k=AYE#HB0_8f_60=}CaZ6q<yN4V7~rkbk|6u`>ERQPB3etL-ZBlIo1lP=8L}
zS^ofNO@2k5{{Ud}PF|<jS~LRv3q$=|OHm7U4z<{O0geV8F%c%#Objdx9S}rfL^ClS
z2AAHw2k`ff>nw6zb`$4&3iZ^tKkI6neAMMqu}>bwI=v&>^wHYVVV#%OwU|VNRA`}#
zQ-6GuaIueP4KaYqD(pJ{0MJyRlPRbR5<&$C#?m00*>qfNq%?GjFOb^g$&P9iRMJ>H
za6zwH0&3PkQ542;gRJ=TqM7XzngYWCY}8s6q44VhGMR*d$Xfy0vMR8^@M00-++fJg
z*%2DIs|-+sEV**cZc@R{N}<Y2;+nV~9)BMOW@t)?GpK<l)AAvyTxDLSEFaEcaUtr$
zCP%N222xS}(=+i;v)uO9RiL{ahf?+E17ksM=rx)bp|#OTv2YIA4VYy$E~7taKYGgq
z7nJ~nNj+Te_hNLyGbDy<KC0;*T^X0jbC*bk4~cAvq{zsX9KcG1a&acw15Xg=A#vjw
zA?aH<MV2`wn~Ym<>C2^;liyZPW8Y}>&+*mU{)q7K^HQM|WGyx3P?h<BQf5@3i7}ag
zSbBiO%*@P0N12(Q`#%77R=uq&I(rKZZ7XC4YeP&1{p%(Gr2$yCY8zq1DgaoM7*Zf2
K5ilbWAOG1tL+dU8

delta 1065
zcmV+^1lIeY3egFWw|@cx0{{R30000000000000FB2m=WU|HJ?(5C8%L00IF41_uBD
z0000000adB0|o&H00<Hk6&6<16BkpHl$F*0!~hxr009L70000000000000000|EpE
z1_%oO!~h`?00IL600II70RR91000000|WsA1qKHa01*fiA%8Ld+5ij#0RRFK0}%i}
z0Ouqg%+M8&?&pEw1=GFjuG-mk=2tzKMtNqp2{Qz%RF=R>CdktXqHS(q`qh;WU&DjC
z!9p9DOP+Cc{@<}9*%kG#ZshPFGjEB8%^A4JnK}mdb888LHnp5nT8Uvyt)DiOyx6Q3
zU~>S=drLY?34b43?A3MdU)1)=-!^i+7pVT)znW=`rE!IjY5<n5quGS`i455i8u~4_
zh>uOA!qRM{cw1~E{+skFHk$Wco3Gm?JG3^Tuu6*<JANciTNJI2B~3*Nd7L<^HxRnE
zbWz1uUBcR`eSPv|{p{zCo&z9X$i=2xgv-jiz)MMHc7NG?IwZ=@GHa+ci*=IE#+tFI
zuJfLuupAgIXuW|E(cdYvhpV^vRD(W3=TYzcgqJO?({Vd^zAeS%b-2{Lf!AjA+T9B~
zNGr3{b{<Hn@;EOYa@^dPL^|B#dcgq~Urq}EQR*wXOvJhE8DKiGmLDmj6&99}D`1`9
z;$1Y6gnt3|=cmV>3A03`I*J*4dxgBa3n5I_glRO|Z_i&({{UZPe}u#Qk10Pubi<zB
zz&{9{$Z?y%M}2s@99o67PH)T!Hf4{*xpQj>(mme63u+u=Qnw6JlZehV%*fFpc2Dw-
zPw9N;^lJXs#rHdW9zK<`4_%|an@$Ok^IAH&HGfP#iORsxzL8D`o0*mg3}<=*w6qTK
zGwU%O_?hDW0L#B5aBBB?ZFtKkmFfB3V@D@T&OB!U<U{nDwl4U$wK&zdbaHihE_SpY
zO4E<n%UXwMc5Px%c05c1;n0w|%3?AZ3)E<t+VeoJ?D$r$dgzh{EQbz3oMbaLmy`fR
z+<(B@uP)L97U|t92c}S3mp_WnpF?yVch|_<4;!L8H2Ebf7*QMRofpQFLZ*^xjnvL`
z-NY@A7F9XdJ|zir$0vt{{Q;P`q#}_XF9#fsk~2XoQIZQuk5WbH5lj2Uy{QpfeaG|R
zE2pJKkb0UgRotmsa@?zIRjk=e_Gw8$h<_v*IaQlkg{6Cs^d8nQy-71~j?l?oR6AGY
z^Er&z7nL(_1qxx)hjF%5O%@ku%efw#3bKKRresbW+bXE0xlfo?4kGX7h99CI?cetv
z9v(C<PEpBoA2U3~B>P;YNn#TA{{TMkdx~vo`iPIYnV;v&3LZl5vXfssFSzUTb0X9n
j2}Droc9Ts}M9jdKRd+@JjwWVegQaT|Ge2K*KR^H3VO-VY

diff --git a/apps/desktopgui/src/desktopgui/GUIVersion.java b/apps/desktopgui/src/desktopgui/GUIVersion.java
index e882a2b73..7bde544de 100644
--- a/apps/desktopgui/src/desktopgui/GUIVersion.java
+++ b/apps/desktopgui/src/desktopgui/GUIVersion.java
@@ -10,5 +10,5 @@ package desktopgui;
  * @author mathias
  */
 public class GUIVersion {
-    public static final String VERSION = "0.0.1";
+    public static final String VERSION = "0.0.1.1";
 }
diff --git a/apps/desktopgui/src/gui/GeneralConfiguration.form b/apps/desktopgui/src/gui/GeneralConfiguration.form
index 5d48a84a3..df02e3d96 100644
--- a/apps/desktopgui/src/gui/GeneralConfiguration.form
+++ b/apps/desktopgui/src/gui/GeneralConfiguration.form
@@ -23,13 +23,16 @@
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
           <Component id="jPanel1" alignment="0" max="32767" attributes="0"/>
-          <Component id="jTabbedPane1" alignment="0" pref="564" max="32767" attributes="0"/>
+          <Group type="102" attributes="0">
+              <EmptySpace min="12" pref="12" max="12" attributes="0"/>
+              <Component id="jTabbedPane1" pref="566" max="32767" attributes="0"/>
+          </Group>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="1" attributes="0">
-              <Component id="jTabbedPane1" pref="309" max="32767" attributes="0"/>
+              <Component id="jTabbedPane1" max="32767" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
           </Group>
@@ -46,7 +49,7 @@
         <DimensionLayout dim="0">
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" alignment="1" attributes="0">
-                  <EmptySpace pref="461" max="32767" attributes="0"/>
+                  <EmptySpace pref="475" max="32767" attributes="0"/>
                   <Component id="ok" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="cancel" min="-2" max="-2" attributes="0"/>
@@ -280,15 +283,16 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" attributes="0">
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" attributes="0">
-                              <EmptySpace min="20" pref="20" max="20" attributes="0"/>
-                              <Component id="jLabel8" min="-2" max="-2" attributes="0"/>
-                          </Group>
-                          <Group type="102" attributes="0">
+                          <Group type="102" alignment="0" attributes="0">
                               <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
-                              <Component id="jToggleButton1" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace type="separate" max="-2" attributes="0"/>
-                              <Component id="jToggleButton2" min="-2" max="-2" attributes="0"/>
+                              <Group type="103" groupAlignment="0" attributes="0">
+                                  <Component id="jLabel8" alignment="0" min="-2" max="-2" attributes="0"/>
+                                  <Group type="102" alignment="0" attributes="0">
+                                      <Component id="jToggleButton1" min="-2" max="-2" attributes="0"/>
+                                      <EmptySpace type="separate" max="-2" attributes="0"/>
+                                      <Component id="jToggleButton2" min="-2" max="-2" attributes="0"/>
+                                  </Group>
+                              </Group>
                           </Group>
                           <Group type="102" alignment="0" attributes="0">
                               <EmptySpace min="40" pref="40" max="40" attributes="0"/>
@@ -302,7 +306,7 @@
                       <EmptySpace min="-2" pref="9" max="-2" attributes="0"/>
                   </Group>
                   <Group type="102" alignment="1" attributes="0">
-                      <EmptySpace pref="337" max="32767" attributes="0"/>
+                      <EmptySpace pref="339" max="32767" attributes="0"/>
                       <Component id="jToggleButton3" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                   </Group>
@@ -311,20 +315,20 @@
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" attributes="0">
-                      <EmptySpace min="20" pref="20" max="20" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
                       <Component id="jLabel8" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Component id="jRadioButton1" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="jRadioButton2" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="jRadioButton3" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="-2" pref="40" max="-2" attributes="0"/>
+                      <EmptySpace type="separate" max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="3" attributes="0">
                           <Component id="jToggleButton1" alignment="3" min="-2" max="-2" attributes="0"/>
                           <Component id="jToggleButton2" alignment="3" min="-2" max="-2" attributes="0"/>
                       </Group>
-                      <EmptySpace pref="48" max="32767" attributes="0"/>
+                      <EmptySpace pref="181" max="32767" attributes="0"/>
                       <Component id="jToggleButton3" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                   </Group>
@@ -391,15 +395,71 @@
           <Layout>
             <DimensionLayout dim="0">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <EmptySpace min="0" pref="560" max="32767" attributes="0"/>
+                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="jScrollPane2" alignment="1" pref="538" max="32767" attributes="0"/>
+                          <Component id="jLabel9" alignment="0" pref="538" max="32767" attributes="0"/>
+                          <Component id="jLabel10" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="jScrollPane1" alignment="0" pref="538" max="32767" attributes="0"/>
+                          <Component id="jLabel11" alignment="0" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <EmptySpace max="-2" attributes="0"/>
+                  </Group>
               </Group>
             </DimensionLayout>
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <EmptySpace min="0" pref="278" max="32767" attributes="0"/>
+                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace min="-2" max="-2" attributes="0"/>
+                      <Component id="jLabel10" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace min="-2" max="-2" attributes="0"/>
+                      <Component id="jScrollPane1" pref="119" max="32767" attributes="0"/>
+                      <EmptySpace min="-2" max="-2" attributes="0"/>
+                      <Component id="jLabel11" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace min="-2" max="-2" attributes="0"/>
+                      <Component id="jScrollPane2" pref="122" max="32767" attributes="0"/>
+                      <EmptySpace min="-2" max="-2" attributes="0"/>
+                      <Component id="jLabel9" min="-2" pref="65" max="-2" attributes="0"/>
+                      <EmptySpace min="-2" max="-2" attributes="0"/>
+                  </Group>
               </Group>
             </DimensionLayout>
           </Layout>
+          <SubComponents>
+            <Container class="javax.swing.JScrollPane" name="jScrollPane1">
+              <Properties>
+                <Property name="name" type="java.lang.String" value="jScrollPane1" noResource="true"/>
+              </Properties>
+
+              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+            </Container>
+            <Container class="javax.swing.JScrollPane" name="jScrollPane2">
+              <Properties>
+                <Property name="name" type="java.lang.String" value="jScrollPane2" noResource="true"/>
+              </Properties>
+
+              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+            </Container>
+            <Component class="javax.swing.JLabel" name="jLabel9">
+              <Properties>
+                <Property name="text" type="java.lang.String" resourceKey="jLabel9.text"/>
+                <Property name="name" type="java.lang.String" value="jLabel9" noResource="true"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JLabel" name="jLabel10">
+              <Properties>
+                <Property name="text" type="java.lang.String" resourceKey="jLabel10.text"/>
+                <Property name="name" type="java.lang.String" value="jLabel10" noResource="true"/>
+              </Properties>
+            </Component>
+            <Component class="javax.swing.JLabel" name="jLabel11">
+              <Properties>
+                <Property name="text" type="java.lang.String" resourceKey="jLabel11.text"/>
+                <Property name="name" type="java.lang.String" value="jLabel11" noResource="true"/>
+              </Properties>
+            </Component>
+          </SubComponents>
         </Container>
         <Container class="javax.swing.JPanel" name="jPanel5">
           <Properties>
@@ -416,12 +476,12 @@
           <Layout>
             <DimensionLayout dim="0">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <EmptySpace min="0" pref="560" max="32767" attributes="0"/>
+                  <EmptySpace min="0" pref="562" max="32767" attributes="0"/>
               </Group>
             </DimensionLayout>
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <EmptySpace min="0" pref="278" max="32767" attributes="0"/>
+                  <EmptySpace min="0" pref="388" max="32767" attributes="0"/>
               </Group>
             </DimensionLayout>
           </Layout>
@@ -441,12 +501,12 @@
           <Layout>
             <DimensionLayout dim="0">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <EmptySpace min="0" pref="560" max="32767" attributes="0"/>
+                  <EmptySpace min="0" pref="562" max="32767" attributes="0"/>
               </Group>
             </DimensionLayout>
             <DimensionLayout dim="1">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <EmptySpace min="0" pref="278" max="32767" attributes="0"/>
+                  <EmptySpace min="0" pref="388" max="32767" attributes="0"/>
               </Group>
             </DimensionLayout>
           </Layout>
diff --git a/apps/desktopgui/src/gui/GeneralConfiguration.java b/apps/desktopgui/src/gui/GeneralConfiguration.java
index ea621213a..912026bf1 100644
--- a/apps/desktopgui/src/gui/GeneralConfiguration.java
+++ b/apps/desktopgui/src/gui/GeneralConfiguration.java
@@ -55,6 +55,11 @@ public class GeneralConfiguration extends javax.swing.JFrame {
         jToggleButton2 = new javax.swing.JToggleButton();
         jToggleButton3 = new javax.swing.JToggleButton();
         jPanel4 = new javax.swing.JPanel();
+        jScrollPane1 = new javax.swing.JScrollPane();
+        jScrollPane2 = new javax.swing.JScrollPane();
+        jLabel9 = new javax.swing.JLabel();
+        jLabel10 = new javax.swing.JLabel();
+        jLabel11 = new javax.swing.JLabel();
         jPanel5 = new javax.swing.JPanel();
         jPanel6 = new javax.swing.JPanel();
 
@@ -75,7 +80,7 @@ public class GeneralConfiguration extends javax.swing.JFrame {
         jPanel1Layout.setHorizontalGroup(
             jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
-                .addContainerGap(461, Short.MAX_VALUE)
+                .addContainerGap(475, Short.MAX_VALUE)
                 .addComponent(ok)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(cancel)
@@ -193,12 +198,12 @@ public class GeneralConfiguration extends javax.swing.JFrame {
                 .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(jPanel3Layout.createSequentialGroup()
                         .addGap(20, 20, 20)
-                        .addComponent(jLabel8))
-                    .addGroup(jPanel3Layout.createSequentialGroup()
-                        .addGap(20, 20, 20)
-                        .addComponent(jToggleButton1)
-                        .addGap(18, 18, 18)
-                        .addComponent(jToggleButton2))
+                        .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(jLabel8)
+                            .addGroup(jPanel3Layout.createSequentialGroup()
+                                .addComponent(jToggleButton1)
+                                .addGap(18, 18, 18)
+                                .addComponent(jToggleButton2))))
                     .addGroup(jPanel3Layout.createSequentialGroup()
                         .addGap(40, 40, 40)
                         .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -207,26 +212,26 @@ public class GeneralConfiguration extends javax.swing.JFrame {
                             .addComponent(jRadioButton3))))
                 .addGap(9, 9, 9))
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup()
-                .addContainerGap(337, Short.MAX_VALUE)
+                .addContainerGap(339, Short.MAX_VALUE)
                 .addComponent(jToggleButton3)
                 .addContainerGap())
         );
         jPanel3Layout.setVerticalGroup(
             jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel3Layout.createSequentialGroup()
-                .addGap(20, 20, 20)
+                .addContainerGap()
                 .addComponent(jLabel8)
-                .addGap(5, 5, 5)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addComponent(jRadioButton1)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(jRadioButton2)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(jRadioButton3)
-                .addGap(40, 40, 40)
+                .addGap(18, 18, 18)
                 .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(jToggleButton1)
                     .addComponent(jToggleButton2))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 48, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 181, Short.MAX_VALUE)
                 .addComponent(jToggleButton3)
                 .addContainerGap())
         );
@@ -235,15 +240,47 @@ public class GeneralConfiguration extends javax.swing.JFrame {
 
         jPanel4.setName("jPanel4"); // NOI18N
 
+        jScrollPane1.setName("jScrollPane1"); // NOI18N
+
+        jScrollPane2.setName("jScrollPane2"); // NOI18N
+
+        jLabel9.setText(resourceMap.getString("jLabel9.text")); // NOI18N
+        jLabel9.setName("jLabel9"); // NOI18N
+
+        jLabel10.setText(resourceMap.getString("jLabel10.text")); // NOI18N
+        jLabel10.setName("jLabel10"); // NOI18N
+
+        jLabel11.setText(resourceMap.getString("jLabel11.text")); // NOI18N
+        jLabel11.setName("jLabel11"); // NOI18N
+
         javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
         jPanel4.setLayout(jPanel4Layout);
         jPanel4Layout.setHorizontalGroup(
             jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 560, Short.MAX_VALUE)
+            .addGroup(jPanel4Layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jScrollPane2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE)
+                    .addComponent(jLabel9, javax.swing.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE)
+                    .addComponent(jLabel10)
+                    .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE)
+                    .addComponent(jLabel11))
+                .addContainerGap())
         );
         jPanel4Layout.setVerticalGroup(
             jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 278, Short.MAX_VALUE)
+            .addGroup(jPanel4Layout.createSequentialGroup()
+                .addContainerGap()
+                .addComponent(jLabel10)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jLabel11)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 122, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jLabel9, javax.swing.GroupLayout.PREFERRED_SIZE, 65, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addContainerGap())
         );
 
         jTabbedPane1.addTab(resourceMap.getString("jPanel4.TabConstraints.tabTitle"), jPanel4); // NOI18N
@@ -254,11 +291,11 @@ public class GeneralConfiguration extends javax.swing.JFrame {
         jPanel5.setLayout(jPanel5Layout);
         jPanel5Layout.setHorizontalGroup(
             jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 560, Short.MAX_VALUE)
+            .addGap(0, 562, Short.MAX_VALUE)
         );
         jPanel5Layout.setVerticalGroup(
             jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 278, Short.MAX_VALUE)
+            .addGap(0, 388, Short.MAX_VALUE)
         );
 
         jTabbedPane1.addTab(resourceMap.getString("jPanel5.TabConstraints.tabTitle"), jPanel5); // NOI18N
@@ -269,11 +306,11 @@ public class GeneralConfiguration extends javax.swing.JFrame {
         jPanel6.setLayout(jPanel6Layout);
         jPanel6Layout.setHorizontalGroup(
             jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 560, Short.MAX_VALUE)
+            .addGap(0, 562, Short.MAX_VALUE)
         );
         jPanel6Layout.setVerticalGroup(
             jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 278, Short.MAX_VALUE)
+            .addGap(0, 388, Short.MAX_VALUE)
         );
 
         jTabbedPane1.addTab(resourceMap.getString("jPanel6.TabConstraints.tabTitle"), jPanel6); // NOI18N
@@ -283,12 +320,14 @@ public class GeneralConfiguration extends javax.swing.JFrame {
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-            .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 564, Short.MAX_VALUE)
+            .addGroup(layout.createSequentialGroup()
+                .addGap(12, 12, 12)
+                .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 566, Short.MAX_VALUE))
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
+                .addComponent(jTabbedPane1)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
         );
@@ -302,6 +341,8 @@ public class GeneralConfiguration extends javax.swing.JFrame {
     private javax.swing.JComboBox jComboBox1;
     private javax.swing.JComboBox jComboBox2;
     private javax.swing.JLabel jLabel1;
+    private javax.swing.JLabel jLabel10;
+    private javax.swing.JLabel jLabel11;
     private javax.swing.JLabel jLabel2;
     private javax.swing.JLabel jLabel3;
     private javax.swing.JLabel jLabel4;
@@ -309,6 +350,7 @@ public class GeneralConfiguration extends javax.swing.JFrame {
     private javax.swing.JLabel jLabel6;
     private javax.swing.JLabel jLabel7;
     private javax.swing.JLabel jLabel8;
+    private javax.swing.JLabel jLabel9;
     private javax.swing.JPanel jPanel1;
     private javax.swing.JPanel jPanel2;
     private javax.swing.JPanel jPanel3;
@@ -318,6 +360,8 @@ public class GeneralConfiguration extends javax.swing.JFrame {
     private javax.swing.JRadioButton jRadioButton1;
     private javax.swing.JRadioButton jRadioButton2;
     private javax.swing.JRadioButton jRadioButton3;
+    private javax.swing.JScrollPane jScrollPane1;
+    private javax.swing.JScrollPane jScrollPane2;
     private javax.swing.JTabbedPane jTabbedPane1;
     private javax.swing.JTextField jTextField1;
     private javax.swing.JTextField jTextField2;
diff --git a/apps/desktopgui/src/gui/Tray.java b/apps/desktopgui/src/gui/Tray.java
index 09cf47c2a..7c95cd6eb 100644
--- a/apps/desktopgui/src/gui/Tray.java
+++ b/apps/desktopgui/src/gui/Tray.java
@@ -185,11 +185,18 @@ public class Tray {
 
         //Add tray icon
         trayIcon = new JPopupTrayIcon(image, "I2P: the anonymous network", popup);
+        
+        try {
+            tray.add(trayIcon);
+        } catch (AWTException ex) {
+            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        
         PeerHelper.addReachabilityListener(new ActionListener() {
 
             @Override
             public void actionPerformed(ActionEvent arg0) {
-                trayIcon.setToolTip("I2P Network status: " + PeerHelper.getReachability());
+                updateTooltip();
             }
             
         });
@@ -197,6 +204,7 @@ public class Tray {
 
             @Override
             public void actionPerformed(ActionEvent arg0) {
+                updateTooltip();
                 int activePeers = PeerHelper.getActivePeers();
                 if(activePeers == 0)
                     trayIcon.setImage(Toolkit.getDefaultToolkit().getImage("desktopgui/resources/logo/logo_red.jpg"));
@@ -208,12 +216,10 @@ public class Tray {
             }
             
         });
-        
-        try {
-            tray.add(trayIcon);
-        } catch (AWTException ex) {
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-        }
+    }
+    
+    public void updateTooltip() {
+        trayIcon.setToolTip("I2P Network status: " + PeerHelper.getReachability() + " / " + "Active Peers: " + PeerHelper.getActivePeers());
     }
     
     private SystemTray tray = null;
diff --git a/apps/desktopgui/src/gui/resources/GeneralConfiguration.properties b/apps/desktopgui/src/gui/resources/GeneralConfiguration.properties
index 32a74183c..3dc629a97 100644
--- a/apps/desktopgui/src/gui/resources/GeneralConfiguration.properties
+++ b/apps/desktopgui/src/gui/resources/GeneralConfiguration.properties
@@ -24,3 +24,6 @@ jRadioButton3.text=Download, verify and restart
 jToggleButton1.text=Check for updates now
 jToggleButton2.text=Update available: update now
 jToggleButton3.text=Advanced update configuration
+jLabel9.text=Tunnel explanation
+jLabel10.text=Client tunnels:
+jLabel11.text=Server tunnels:
diff --git a/apps/desktopgui/src/router/configuration/PeerHelper.java b/apps/desktopgui/src/router/configuration/PeerHelper.java
index 2272456f8..f59309705 100644
--- a/apps/desktopgui/src/router/configuration/PeerHelper.java
+++ b/apps/desktopgui/src/router/configuration/PeerHelper.java
@@ -94,7 +94,7 @@ public class PeerHelper {
                         }
                     }
                 };
-                activePeerTimer.schedule(t, 60*1000);
+                activePeerTimer.schedule(t, 0, 60*1000);
             }
         }
     }
@@ -134,7 +134,7 @@ public class PeerHelper {
                     }
                     
                 };
-                reachabilityTimer.schedule(t, 60*1000);
+                reachabilityTimer.schedule(t, 0, 60*1000);
             }
         }
     }
diff --git a/history.txt b/history.txt
index a6bac8ef1..5c2ecea36 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,9 @@
+2009-04-13 Mathiasdm
+    * Bugfix on tray icon updating
+    * Some more work on the general configuration menu
+      (currently not added to the tray icon menu yet, needs more work)
+    * Tweaked the desktopgui logo
+
 2009-04-13 Mathiasdm
     * Added I2P version and GUI version to desktopgui
     * Tweaks to the tray icon menu