From 5fbcf0a164c201d94deb8bf907a84a5c6b13afd5 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Wed, 11 Jun 2008 17:50:45 +0000
Subject: [PATCH] Change systray icons according to global status.

---
 .../images/impl/systray/systrayIconAway.png   | Bin 0 -> 822 bytes
 .../images/impl/systray/systrayIconFFC.png    | Bin 0 -> 895 bytes
 .../impl/systray/systrayIconOffline.png       | Bin 0 -> 441 bytes
 .../impl/systray/systrayIconWindowsAway.png   | Bin 0 -> 1388 bytes
 .../impl/systray/systrayIconWindowsFFC.png    | Bin 0 -> 1426 bytes
 .../systray/systrayIconWindowsOffline.png     | Bin 0 -> 772 bytes
 .../impl/systray/resources.properties         |   6 +++
 .../communicator/impl/gui/GuiActivator.java   |   3 ++
 .../presence/GlobalStatusSelectorBox.java     |  32 ++++++++++++++++
 .../impl/systray/SystrayActivator.java        |   2 -
 .../systray/jdic/SystrayServiceJdicImpl.java  |  35 ++++++++++++++++--
 .../service/contactlist/MetaContact.java      |   1 +
 .../service/systray/SystrayService.java       |  15 ++++++++
 13 files changed, 89 insertions(+), 5 deletions(-)
 create mode 100644 resources/images/impl/systray/systrayIconAway.png
 create mode 100644 resources/images/impl/systray/systrayIconFFC.png
 create mode 100644 resources/images/impl/systray/systrayIconOffline.png
 create mode 100644 resources/images/impl/systray/systrayIconWindowsAway.png
 create mode 100644 resources/images/impl/systray/systrayIconWindowsFFC.png
 create mode 100644 resources/images/impl/systray/systrayIconWindowsOffline.png

diff --git a/resources/images/impl/systray/systrayIconAway.png b/resources/images/impl/systray/systrayIconAway.png
new file mode 100644
index 0000000000000000000000000000000000000000..f50342936dfc30b1f6ffe12f5b88e5139f40a278
GIT binary patch
literal 822
zcmV-61Ihe}P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00Bb)00Bb*A4n4;00007bV*G`2iOJ+
z5H}q1*cnIw00Op2L_t(I%dM16Z&ODUhMyT<`zB6&^Wg;BKvR@T#R&odm5S&JRccoV
zsf#Y!HDXDn{*EqLBU-78vOxl*N|Xf%5FZkVgg}IX>tG^cuubFK5BuI3-(le@QbA5?
z$XU(kJ@e?ynfHwN<@Y;=4~Qsild=bT>XHu()vVzA{`Q0O>2(J5>+J(aQOMlF5);V=
zkx2K<v-*LS$}5zsP2$kywoH(p&3$~uK@hOGTtkH+LHz{_jj>Jh|2Nog*7>ej<IFb?
z`Szeg%l8O;@8iLatvP-8Da8q&pN~94*Pn3x$|W+@i?qG9{=toUjhom0;?FBL`0YWK
zwt{o>Q;6Ib%oe9Pb?7;1Z@$0BE0rreUMyh-3&_GQeqGYsYczS($Rbnlv=;Kxwb;MI
zXRaUc^2#e1$|3&UYh&@Kk=@YS#^y$42MJriP#@qZ>OjJ<Z>&x+*I~*DNF^ob=Y}Y|
zV<0U`?l^mgWq++m+mcqNO*I^0{bfwevp9KRiL=K8u9hdcu=EKluFdpRray3YB+cLT
z4voO#ryo9rq{E{6n)!|<&Nn%c3t0;^3LD#BCA15@!LAojSzcyu@pEQoXLxb>0<CsP
zzVIc5{7zb}7XPgKwA+J7?UC_A{1CK`2{)_w)}8xU9gpund&1rI1EeyOsL@F<1~9~?
z>(YcYC?n7$0kyf0%av6kIm|#xa%}f1yUhZ=ak^q06C2R603k3W&?bcta_dj1*>oXc
z^TzDt$3GNrtUX|L4|<VgBJLVb3J@Xz8%Eq>qy;emNjl6N{))l~NaZ4<HNw~eA&^oc
z<<>vJe=2r{2ccT!=#d#l9f$1r_=fhn;S$FN6)7U6h_ph5-L+O4Kh$9N08dVgGgN-g
zsN=jp-gQH%?!I$bn+=*h+Pf9QnGE~)71@q>3qX`6_H2suS^xk507*qoM6N<$g1Ah5
A)Bpeg

literal 0
HcmV?d00001

diff --git a/resources/images/impl/systray/systrayIconFFC.png b/resources/images/impl/systray/systrayIconFFC.png
new file mode 100644
index 0000000000000000000000000000000000000000..46a8200c5bceeb7ed8c60f575ad69124ab8bc55c
GIT binary patch
literal 895
zcmV-_1AzRAP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00Bb)00Bb*A4n4;00007bV*G`2iOJ+
z5H=nK%}FHy00RF>L_t(I%dOPOZyR+K!13=ao*6s#G~VJSgb)R(wbR6+<q$y+AkkDD
zdVm9$UbrA6E*$t9ICA97CV>Q(AV5M2NGuIXL6kNN4JCCPyIGvr6Yw(Qnei-KP!Uoc
zaNFPQr}y;vJ-y%46W;ppYRG*Y*RfGlt#4f9K2NV%#Wc-_51)*+(7eNk2fMDr%K9dm
zh=D7_`sT@lpr!H-<yw=#X|pU!oSe=*c*T}wv9VpJ=Qvo6JFFYYWApzvY&ILbn6LBp
z{0%NXq0==xSZ3$JVO{lj{oF0`8Iw2WZsRp>^4;R+Bx;{wcm5n4HX3!7zWs_X7q9Ta
zFKO%^ytg`mkb9Ep{1mUAtq|+14)%Gaa+O~<N`%o-#L-81f79b9qsf|)MpWQd-C?gS
zGdp6kG6=lAa{xm*gum}zD6?jy@5b#=<w|t~Nflsd0N8bXkV4KR8{~676S{>G5&2|g
zh;lm#qD-ls;&fabtQ9d;r0d(%oD;P60_q)^SBjgwbIIcCa+Zb7N7-qsOid&PgVQHs
zY&CogOUCdW(&q1c)KiJ55|gPK&rQ_WZ6>K$&m;d=E7~24>h?CL^QS0G7r67q0$tld
zjOTdsWsUuV4Mvq^0!;%+MD!f4|6%a6{~Dnf?GOKO^%}C@;iboK@?)!rlE~5<&H}J&
z{Kl!oGE0p)h9fN;TcPV}oE`gy{mKkG;>CN<ak;vWE5^|jk!Q#E84uSnL;Y@C^6P|(
zNZm<s<fb_EMmTgc1X_fww$;BC&1M@Um7{Qs%OCeRk|#m_=WWOJ`Tq7e7m7<bx(3Mv
zLd)UC^$fls^oIok03!Gl&OOamWsd`+4WW-nNZ`d#C67-RMu<5UAr7_{W3m`<=spHY
zA6Sn^p;qImxdOwwPCAwPR~7HBb$MY%p)kA3%A$?shs?~YpcOd?p6Oq4Hj`qgTwz$(
z?>T<svlqDLpJyysV(L-}1d+Nk#h!VdP>S}4<B0^bXY$7`rBI5pE6ua(%^$nQ{sMmW
VJ1O?^{d)ia002ovPDHLkV1m!Pq?rH!

literal 0
HcmV?d00001

diff --git a/resources/images/impl/systray/systrayIconOffline.png b/resources/images/impl/systray/systrayIconOffline.png
new file mode 100644
index 0000000000000000000000000000000000000000..7db6479bed8880b38baefd86d25b3f72d5db755b
GIT binary patch
literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq000&M000&U1ONa4ZoQ<i00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L00Bb)00Bb*A4n4;00007bV*G`2iOJ+3<e|#
zyZmqf00BKoL_t(2&yCYdOIuMC1>o=AT$9#UB?(b0SZF7rMM$Bv9hClx{y_a3&c%rx
zh(SuhU{%yST5d6xq<M4_L*8-C&fbf4_S$EiV83G`>QV#e&=mYpdpdbh>uKbMQ%S)<
zEgDZPy3z2%)@<bmMRirBp?Wml*jsO$_^xJQmU7A`IiLM<pwhRI5#@@4TP=CVvNnBi
z)Kia!jh%UBRl%LIq&u;7&GBPgnHQp?3_6M)CXLY$%38Bx&aqf1_HvTJl)zt?uB3hS
zMMm7GH>CVRSxw8WbMI}~b*|?5u=2fvrfv7i>XH(^Ikf3@kJ?8*axGA`C}*L2VOD7%
zcU|&NfuvVL?Ov;`?YH^S=Z+<G><N1&{#mmzEgN|kD&4KTlNpIY^ceFSA1zBy`wNdV
jXGNCHLYKT`$87uuPa{*pp16Rt00000NkvXXu0mjfnybGK

literal 0
HcmV?d00001

diff --git a/resources/images/impl/systray/systrayIconWindowsAway.png b/resources/images/impl/systray/systrayIconWindowsAway.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5a110a692999e41336124a06547a704b63ab2f1
GIT binary patch
literal 1388
zcmV-y1(W)TP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOJ+
z5IGG7>l8Eq00itwL_t(Y$Gw(YY*a-U$G<Z(=bYW{ZoAvd?zY>OwnBjx3nI5*OF-fU
zMIag)6^TS*FhHWw5`92XF%kuRFfl}l#!FC$(JH~HgeTA{2x3S|Ewq%S+k4mD?RL+c
zGjq<257g)b)Up&Onan)=C%^pj-3G%XuBEFsl}(wk&=qa}HFGTunoMBWYtO2!@N5}R
zGpWD=oL<mSMT`Cy;F5=$YB3?J^IRf4o{mgH++4P&{2A`8+_={NjW}@r;pXx5%8kJ4
z*X@46afcq0ntw)t*=9wo-#gyl|M~2j0&Hk}F=FRVYm=Hk2OJYb^eDoi*#@!Vw;Vt4
z(!k`$P$5rf7;wG)RqKPwhn;$GrjVX8msHS(@t)yqd28nv-nqSS-|g#adn)c&7%7OQ
zaYtud^*Zr(y?pAdix`twGTtXA&0zqK4%E~Z=fm^{0Dm!TUy+%n4xPk;rxzEy&967t
zd%7AQd8*-tfeY_mf9sqjYxf^)C9fVFnm+`(2LJ%xIimd5ug}#|kw(|!Q@di@=5~}%
z&x^m3by=)_a#xKa*q8o5UZl?{ah>Z`)V*zqp+N4L*qPqkSo2{0qTmz)nu_4EHZuWX
zH!OFgZ)Y~ZrK>gtE+l=;jyqDVB@t*Ug0c_>MfDZE)mZ_$ic3qw2s9Ogt|915-<EF|
zs^DcLFDr+R=HHrMQdzBQR~%?623<v<Y5&}X1Q3n{M@SfU)m5MFZtL$$N}3f=*R}k@
zkQX!!fes9cM~)9yjh^nYY@xYztPYS$)W&Pdsc$-QgajcJ*SW!*t|@tRG%KJ+P|EAZ
zz>K6_kZKt$&1dbP2T@R^Ig3iub>X63y(2Xunp@9ZI+>p18C4@iQIV(C1=G>2fQ)7i
zCI)(+C%&Mo!*^H7c}tc!LV{yTIMhDS-{fvFY9db6wuo8L7W*mw+R@M-Q5A*Hd+_nB
z3jbnj%W!G+f<?AoP|a)rlR03elVByHV4A{vqCXNy_jmX5o^~e_yJSv97cyR#&^|ro
zZo1Tdnog*f-n;dKkQMJ*sYT{}_QRevbm_XC9xF9?!ZH#y?%be~Q&<Y#!ZOe_7hr+`
zV+8!qDBoB2k?JK3zUwOb_`dDmZ<tW?UbcSMOvAL!IE?Ab!k0S+pya(z-g|S;;x$e0
zl0d~~H76G^#(*&fLJ&N+A|F7@1(PG-HV4~GIT&ddxnpzAxQM4R&X$dhbFLXfZqWmy
z(yyy14I2VS0zntuQNH=n2aXPV=2Hg)Gbj*@0TT=aV+a?Apg3Ftlu}5HWWct4CTA?4
zQtFtd=`hBU<0g$ndX=twK$;weD(+F!mrrEQ4(HBGFprxEI_3<IxkLa`0)PY|0SLwn
zq~QE|CcdKkG?(TAjtk)RmP&8WaIr7Jaukd$AlL>>&=rSc8-xHM0YJfARf%QW{QCYh
zm=LMEbkGUF2t}uKBzJfaH7KQEPzr`&f?*io(1fr@2ag#X3sA6)G2;J~@mF<7EuPHL
zS;$VszWwEkmsbJ+%v<^F8%PnmrF6gsC8dJ>bD@$s_T%Bb8M0?%KSIbqkrKNq(4=NR
z;@#fAVE_Q94!_L+;OT$s+Q-iB-r*5uF@rNEEXE|`%wZ;z7H5JpF4B}c;{t`1>gKlW
uo9O7efBAyyiE6Lj+BiL=2yqr}!uktbi!Pu;wZ0?(0000<MNUMnLSTa3&xptX

literal 0
HcmV?d00001

diff --git a/resources/images/impl/systray/systrayIconWindowsFFC.png b/resources/images/impl/systray/systrayIconWindowsFFC.png
new file mode 100644
index 0000000000000000000000000000000000000000..97e9994c81d40a61b3801d30328b5e0638e00a90
GIT binary patch
literal 1426
zcmV;D1#S9?P)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOJ+
z5I7o~BcQSX00k0BL_t(Y$Gw$XY*a-U$G>xC&YW}he(QF-+m^PLQd(#cfi~C@@vcE2
z5(tV!A|aT<gAXM_K)j$51z$)AL8A{El*UMfz=MPs16U|`F{QR_X$#xSc6Zs`?sm^*
z&za)`8eg<*mf}3k!+++N|9sznJ_J*^o>;oEWLkBDFxYc(;=eTPR04e#ZB}iWdDCQ?
zDFwPwYC&^_RPet57p-WmMHnx$3)DB64o^Yd1kGIfR@PF!ex>6mJ>0vxeKI}sAh4!2
zd$#Ig;cEtQRJ-MFC7@gjetzh?`iBB+UiD5uvrX?dh{FWB40P}miwf&AScyGy=J3w&
z)Yp)~Zx95iNjuW@GV@g*@102vbBSOu?7GR0p?rBO=X;*q;rZgRHMK)!k2eI|p%e=C
z#W;%|>)}f)XWc>whZ3<7W6B&lQ94{xTjYWn%>a%f*zv-|bS`oM(QImAktqMz(q!&m
z^~#&g4-9O0cJ1sri&h?L>%t$jMdn9<Hv<5`zLU(AQGPB-2385LSN4at%ng>#u*crd
zI~L0}?5<&``h&x14~*!3;l?n-9q5inoVKf>tHZWX`&d(>cNzx5v2dHrjDt^vr*y-*
zD<9w!OE)@iCamqc7^or%76`{eNg)D;vle{TR|Y(Xii>?L5Do!PSm;YV>e4(MSX6A!
z%b`vjn_d3$DxTbPKsW?E#{wb$?5P1jbpv#2Kvbx!x_qa5bR=O&c>#HzxIBdxAcO@T
zR45uh6Rk*J9#S+)L>_TrT+Vi9Yf2^S46IWFC}o5jW2XLTb}5|~kYF}x5fP}Fgyv3m
zj1{}o9^k#Kmy=A5#i=@9!7v|8j??z88v_?obIfTjP%udCT%9*Hm={o$CfefR;kU8X
zD+I02_<I$@uTukb*??m`;n7yHBU2O5E4BpWvhL8Yu@6rb{xQh0zFsprlUML>b#+9G
zs}?kByt_)(0Ay7MC6xdrJ_xc*EuEtQXKM7$aCWFip9l@emF&$4i$KXYm&DeAp372B
z4xiurWuX%5UqS-&zWr(Maw)6GtJBv{bSjy6jcD^SCQmWgJS9+`{u#U$0b&&S2gM>_
zOg=|EZSnhQ^2jg84#sl&yce(CJu@RKS9Mk87yE7p!{9&o^}$c~E?nNaA3MuhIFk(!
zLVys0w&iDGB-{-}<Qz~z06;9Tnr!smt^fT(a>=rmmTd#~b(mG8!)e38b8HIMIZryh
zg7j`_%d0P)ikjz3Is!E#0Y(TAMlcjhK$Z0zoQ*bsgBu4$=0H|Swz1@5Njw|a4geeO
z3p7~1g6GX($XSS#J;$YPcTQZ7+UCVovxun#2qD1uo<pQZz#uF{6c<nxLxzgFtYS(<
z4qWC)bxvK%@Kz!a0kX&qA9s{nhN4B*xN2e$QUD_j5N7W=L<kgBhtt7gc)IQ^Xb!Ak
z56Lh|1ukCl6OLiooPY>pgA;gQjVz2O*-JcY95=Jl*0_XBf7cEp225C^R5P&x){LX=
z1=J*`Spyi0EV`hgURB1Vg1(%lg`{K?hOUB^44pXt{d)~pj_=uJCt0Uk%<i*u>OO&$
zcZraC(ZfV-2Rh476W-S~YxcO5xT`QDkqlE(t*R!`-y2fucjnZkbt^u(X2M$K`L^wr
zTyna9|L%%P@we@6Yq$y+7Gjyg-e79>N1HZnyOq<EQYCpOs~ID?j;_BhUZ0Eh--Dl(
gjxm&8hljBK1OlQO6Yfktb^rhX07*qoM6N<$f|N9YK>z>%

literal 0
HcmV?d00001

diff --git a/resources/images/impl/systray/systrayIconWindowsOffline.png b/resources/images/impl/systray/systrayIconWindowsOffline.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d3f8beeabe3ce63a3bb8c1130889a312b80bc50
GIT binary patch
literal 772
zcmV+f1N;1mP)<h;3K|Lk000e1NJLTq000~S000~a1ONa4*aR0J00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOJ+3<niK
ze$5L200M|fL_t(I%bnCqXcJKs2H<}(b0?EY6HP))nwT1^4So4QrD~-c>q4}(2whYW
z6bmBQg$qS@qFYz)-H2E$qP5o2m53D)QS1Y)tyJ5ZRP$(3gPBLt%pEr^Boe35J1~ng
zd|duJ=N=Yit@c2zFfA2UOyxmaWAH+8rA$bgYTW+;k2i1~7H@HlTQi+txhQrA=wyF!
zoiS!zSIwvR+U2Y^b9cu-z)rvQ6EA9rnA~!1%Y#_i8JV*j%YC$daZ^!X&J=%Rjo|)+
zn|JRFHo1PzBq~zotzX$lQZH*q6036tVZ*VS6q|3hK5m^o(Xu8yw5{dd=#6lK2Qd7e
z<2MKmk>)Drb;IA$T~8l6{5fHPj3w-mNaWkT00>M=E;QN<V7nvPFN8D@ctG4AKsI_o
zz(a95kXdH{NslMQgMeW5O+i6HLUYk2#Q>U}9`InGEYbyuHxtFAREZn~6{53_i~;1*
zBILXhcTH0hFK*iIHZRffxwMsabEI<K04ja)D^`K`rF|3>$>?6$U+oWulfzT0*Z$J5
z<xUT}+W-wJ6!5UZ^W7>+vXs*8<GTivC3ZaTNwrn>-cqt%lW*jDJL7~4X0T9w(d7f{
ziSP5BRaVphC+p(#^6lKjxl8vY?nQv{!h$Sh$dCb5!_2F<mrM3)=$YmR>h;Rj&|&!~
zLo`rmD^DiD$47hmrb=F9Q?&(Ict}i&?NKdxu;9Rg1&6Hqt2r<BPXA>B@H_#F=M{@K
zm03kBSm-(0^)&qF0TyKBbO8j)JJU5zR#vj9R2ot11_nyp)q*h*wRw_5kJ^AEeD0<W
zJ<YrpMuwy{XIaNsX9i`jf{eMa_T#_c@)LcceE1v2XXq^Ff4L+80000<MNUMnLSTaC
Csa9eD

literal 0
HcmV?d00001

diff --git a/resources/languages/impl/systray/resources.properties b/resources/languages/impl/systray/resources.properties
index 91db023f4..6a424e31e 100644
--- a/resources/languages/impl/systray/resources.properties
+++ b/resources/languages/impl/systray/resources.properties
@@ -4,7 +4,13 @@
 # See terms of license at gnu.org.
 
 trayIcon=resources/images/impl/systray/systrayIcon.png
+trayIconOffline=resources/images/impl/systray/systrayIconOffline.png
+trayIconAway=resources/images/impl/systray/systrayIconAway.png
+trayIconFFC=resources/images/impl/systray/systrayIconFFC.png
 trayIconWindows=resources/images/impl/systray/systrayIconWindows.png
+trayIconWindowsOffline=resources/images/impl/systray/systrayIconWindowsOffline.png
+trayIconWindowsAway=resources/images/impl/systray/systrayIconWindowsAway.png
+trayIconWindowsFFC=resources/images/impl/systray/systrayIconWindowsFFC.png
 trayIconMacOSX=resources/images/impl/systray/systrayIconMacOSX.png
 trayIconMacOSXWhite=resources/images/impl/systray/systrayIconMacOSXWhite.png
 addContactIcon=resources/images/impl/gui/buttons/addContactIcon.png
diff --git a/src/net/java/sip/communicator/impl/gui/GuiActivator.java b/src/net/java/sip/communicator/impl/gui/GuiActivator.java
index 30d63cea2..aece132ac 100644
--- a/src/net/java/sip/communicator/impl/gui/GuiActivator.java
+++ b/src/net/java/sip/communicator/impl/gui/GuiActivator.java
@@ -295,6 +295,9 @@ public static SystrayService getSystrayService()
             ServiceReference serviceReference = bundleContext
                 .getServiceReference(SystrayService.class.getName());
 
+            if(serviceReference == null)
+                return null;
+            
             systrayService = (SystrayService) bundleContext
                 .getService(serviceReference);
         }
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
index 38e778108..c38362f3f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
@@ -12,11 +12,13 @@
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
+import net.java.sip.communicator.service.systray.*;
 import net.java.sip.communicator.util.*;
 
 /**
@@ -373,6 +375,36 @@ public void updateStatus()
         JMenuItem item = getItemFromStatus(status);
 
         setSelected(item, (ImageIcon)item.getIcon());
+        
+        setSystrayIcon(status);
+    }
+    
+    private void setSystrayIcon(int status)
+    {
+        SystrayService trayServce = GuiActivator.getSystrayService();
+        if(trayServce == null)
+            return;
+
+        int imgType = SystrayService.SC_IMG_OFFLINE_TYPE;
+        
+        if(status < PresenceStatus.ONLINE_THRESHOLD)
+        {
+            imgType = SystrayService.SC_IMG_OFFLINE_TYPE;
+        }
+        else if(status < PresenceStatus.AVAILABLE_THRESHOLD)
+        {
+            imgType = SystrayService.SC_IMG_AWAY_TYPE;
+        }
+        else if(status < PresenceStatus.EAGER_TO_COMMUNICATE_THRESHOLD)
+        {
+            imgType = SystrayService.SC_IMG_TYPE;
+        }
+        else if(status < PresenceStatus.MAX_STATUS_VALUE)
+        {
+            imgType = SystrayService.SC_IMG_FFC_TYPE;
+        }
+
+        trayServce.setSystrayIcon(imgType);
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/systray/SystrayActivator.java b/src/net/java/sip/communicator/impl/systray/SystrayActivator.java
index b5ee5a751..b606b16eb 100644
--- a/src/net/java/sip/communicator/impl/systray/SystrayActivator.java
+++ b/src/net/java/sip/communicator/impl/systray/SystrayActivator.java
@@ -6,11 +6,9 @@
  */
 package net.java.sip.communicator.impl.systray;
 
-import net.java.sip.communicator.impl.notification.*;
 import net.java.sip.communicator.impl.systray.jdic.*;
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.service.notification.*;
 import net.java.sip.communicator.service.systray.*;
 import net.java.sip.communicator.util.*;
 
diff --git a/src/net/java/sip/communicator/impl/systray/jdic/SystrayServiceJdicImpl.java b/src/net/java/sip/communicator/impl/systray/jdic/SystrayServiceJdicImpl.java
index f47d1a83b..15d08e41c 100644
--- a/src/net/java/sip/communicator/impl/systray/jdic/SystrayServiceJdicImpl.java
+++ b/src/net/java/sip/communicator/impl/systray/jdic/SystrayServiceJdicImpl.java
@@ -87,6 +87,9 @@ public class SystrayServiceJdicImpl
      */
     private ImageIcon currentIcon;
     private ImageIcon logoIcon;
+    private ImageIcon logoIconOffline;
+    private ImageIcon logoIconAway;
+    private ImageIcon logoIconFFC;
     private ImageIcon logoIconWhite;
     private ImageIcon envelopeIcon;
     private ImageIcon envelopeIconWhite;
@@ -136,6 +139,9 @@ private void initSystray()
         if (osName.startsWith("Windows"))
         {
             logoIcon = Resources.getImage("trayIconWindows");
+            logoIconOffline = Resources.getImage("trayIconWindowsOffline");
+            logoIconAway = Resources.getImage("trayIconWindowsAway");
+            logoIconFFC = Resources.getImage("trayIconWindowsFFC");
             envelopeIcon = Resources.getImage("messageIconWindows");
         }
         // If we're running under MacOSX, we use a special black and 
@@ -150,11 +156,16 @@ else if (osName.startsWith("Mac OS X"))
         else
         {
             logoIcon = Resources.getImage("trayIcon");
+            logoIconOffline = Resources.getImage("trayIconOffline");
+            logoIconAway = Resources.getImage("trayIconAway");
+            logoIconFFC = Resources.getImage("trayIconFFC");
             envelopeIcon = Resources.getImage("messageIcon");
         }
 
-        currentIcon = logoIcon;
-        trayIcon = new TrayIcon(logoIcon,
+        // default to set offline , if any protocols become 
+        // online will set it to online
+        currentIcon = logoIconOffline;
+        trayIcon = new TrayIcon(currentIcon,
                                 Resources.getApplicationString("applicationName"),
                                 menu);
 
@@ -434,6 +445,24 @@ public void setSystrayIcon(int imageType)
                 this.currentIcon = logoIcon;
             }
         }
+        else if (imageType == SystrayService.SC_IMG_OFFLINE_TYPE)
+        {
+            if (!osName.startsWith("Mac OS X"))
+            {
+                this.trayIcon.setIcon(logoIconOffline);
+                this.currentIcon = logoIconOffline;
+            }
+        }
+        else if (imageType == SystrayService.SC_IMG_AWAY_TYPE)
+        {
+            this.trayIcon.setIcon(logoIconAway);
+            this.currentIcon = logoIconAway;
+        }
+        else if (imageType == SystrayService.SC_IMG_FFC_TYPE)
+        {
+            this.trayIcon.setIcon(logoIconFFC);
+                this.currentIcon = logoIconFFC;
+        }
         else if (imageType == SystrayService.ENVELOPE_IMG_TYPE)
         {
             if (osName.startsWith("Mac OS X") && this.menu.isVisible())
@@ -459,7 +488,7 @@ private boolean checkInitialized()
         else
             return true;
     }
-
+    
     /**
      * Shows the oldest message in the message queue and then removes it from
      * the queue.
diff --git a/src/net/java/sip/communicator/service/contactlist/MetaContact.java b/src/net/java/sip/communicator/service/contactlist/MetaContact.java
index 8bd7ac33d..92a695030 100644
--- a/src/net/java/sip/communicator/service/contactlist/MetaContact.java
+++ b/src/net/java/sip/communicator/service/contactlist/MetaContact.java
@@ -150,6 +150,7 @@ public Contact getContact( String                  contactAddress,
     /**
      * Get all details with given name.
      * @param name the name of the details we are searching.
+     * @return list of string values for the details with the given name.
      */
     public List getDetails(String name);
 }
diff --git a/src/net/java/sip/communicator/service/systray/SystrayService.java b/src/net/java/sip/communicator/service/systray/SystrayService.java
index 3199812c8..951bcafb9 100644
--- a/src/net/java/sip/communicator/service/systray/SystrayService.java
+++ b/src/net/java/sip/communicator/service/systray/SystrayService.java
@@ -40,6 +40,21 @@ public interface SystrayService
      * Image type corresponding to the sip-communicator icon
      */
     public static final int SC_IMG_TYPE = 0;
+    
+    /**
+     * Image type corresponding to the sip-communicator offline icon
+     */
+    public static final int SC_IMG_OFFLINE_TYPE = 2;
+    
+    /**
+     * Image type corresponding to the sip-communicator offline icon
+     */
+    public static final int SC_IMG_AWAY_TYPE = 3;
+    
+    /**
+     * Image type corresponding to the sip-communicator offline icon
+     */
+    public static final int SC_IMG_FFC_TYPE = 4;
 
     /**
      * Image type corresponding to the envelope icon