From 98dc2c732e2ae6891d35cd0c024cc6975931fb32 Mon Sep 17 00:00:00 2001
From: Ingo Bauersachs <ingo@jitsi.org>
Date: Sun, 29 May 2016 18:45:58 +0200
Subject: [PATCH] Remove unused envelope icon

---
 resources/images/images.properties            |   4 ---
 resources/images/impl/systray/envelope.png    | Bin 756 -> 0 bytes
 .../images/impl/systray/envelopeMacOSX.png    | Bin 565 -> 0 bytes
 .../impl/systray/envelopeMacOSXWhite.png      | Bin 554 -> 0 bytes
 .../images/impl/systray/envelopeWindows.png   | Bin 1431 -> 0 bytes
 .../gui/main/contactlist/TreeContactList.java |   4 ---
 .../jdic/SystrayServiceJdicImpl.java          |  29 ++----------------
 .../service/systray/SystrayService.java       |   5 ---
 8 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 resources/images/impl/systray/envelope.png
 delete mode 100644 resources/images/impl/systray/envelopeMacOSX.png
 delete mode 100644 resources/images/impl/systray/envelopeMacOSXWhite.png
 delete mode 100644 resources/images/impl/systray/envelopeWindows.png

diff --git a/resources/images/images.properties b/resources/images/images.properties
index 482dc8505..736cb541c 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -408,10 +408,6 @@ service.systray.DOCK_ICON_EXTENDED_AWAY=resources/images/impl/systray/dock-exten
 service.systray.DOCK_ICON_FFC=resources/images/impl/systray/dock-chatty.png
 service.systray.DOCK_ICON_DND=resources/images/impl/systray/dock-dnd.png
 service.systray.STATUS_MENU_ICON=resources/images/impl/systray/statusIcon.png
-service.systray.MESSAGE_ICON=resources/images/impl/systray/envelope.png
-service.systray.MESSAGE_ICON_WINDOWS=resources/images/impl/systray/envelopeWindows.png
-service.systray.MESSAGE_ICON_MACOSX=resources/images/impl/systray/envelopeMacOSX.png
-service.systray.MESSAGE_ICON_MACOSX_WHITE=resources/images/impl/systray/envelopeMacOSXWhite.png
 service.systray.QUIT_MENU_ICON=resources/images/impl/gui/common/quit16x16.png
 service.systray.CONFIGURE_ICON=resources/images/impl/gui/common/configureIcon.png
 
diff --git a/resources/images/impl/systray/envelope.png b/resources/images/impl/systray/envelope.png
deleted file mode 100644
index 1d6b70adcd1bef07080f3704d6a4b6912093f94b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 756
zcmV<Q0t@|#P)<h;3K|Lk000e1NJLTq000&M000&U0ssI2OV;~r0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!mPtfGR5;6H=sxw5NL0PyRPnL{nBok?
z8&NoUeo{>n1xB2F5fT%TTT@P^5xMhrn1&UUB)g<FG?QaQKyjz6b)tY_w63mJ=dmZ`
z7~z&wZ5EiNZfqmwQJXevJIO}0?!Q}?AOEaTd1{51O!yS9!uG~p*GV&?<JhwuT?u~<
zr2aaV?&M@+=i*u&Vpq~LohT!6=5DhKjB*Q&OG^m7zqe&>M_m8PeO-$-Ju8!M%a0~(
zM9Rd~VcC^SPQO}k`t7vC&sutWX0F|{boGXnD_5;rJa^&b)(J=M5ilaMVOHzz=XKkk
zmTh{{yZZ2!&71Gsx%2hw*S~-N0!bhnC^CEJaePMj*UXApd@sFg&a7!2hYlY6@#DuI
zQ~(qKibG7nZiGYO6s^)-p5;@wZrSqX%a`xi08kt#3-l3oBVs3SQb=2$HF@jp+qXZ0
zfxo|hSZF8&0of42+qZ7b-F_Iwh^~__ysKtpE!+=e+osmfoIU5oix;n7zXoaplI?A6
zeZ9Rv^4G6l5D}p4vb7sfj4+9<5-<#Qbv6sj%n7XQU$%Vt6EG+$ENrN+2Qq$u0gw$8
z0WyFhz$ij7Lfj%u$i8%Xsl$~G#b%D~)8{R@ckkZayLTb>S5{O2bplC<TfTk!29!m2
zg|KD3s7I@jsfD$RKfh5*M(yMqH*Q?Jb`7X!@uEdjr%VAdfFzI&WB_9qC_4`=EJU61
z#JpQIJ(G?6(*(7BG(B>GVSf4Y<qH=se8vEf7@2tFE~-b|ij<t=fTatNU9jx1UujSC
zw1vR<KYRA<DO3Oy!JaN;Y{FA#Y(a})pgLe$1bPRk?fCKIKoZEtnL6!Ls<9@MiAU}M
m;~yAu!0-o>K=wqWJOThQKIo%hLuH!)0000<MNUMnLSTY}NM2n4

diff --git a/resources/images/impl/systray/envelopeMacOSX.png b/resources/images/impl/systray/envelopeMacOSX.png
deleted file mode 100644
index a19704bea4cdce732d0011ddc0829e0eba066af6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 565
zcmV-50?Pe~P)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz*GWV{R7l6Y)=h{_VHm*ipGFolN>Maw
zurLcd3$Y<A?9{BJ)NH6JWhcr)jbvkCqh#S@rm1O^DcLC5uoKpZe3XwFnyV1ay>lI#
zXYqDB_uM<jJr+-=_c`zT{Chs%SC(aZDY#YmzlWd|IEH7H1F;qNa2w|<17Zti&_o^A
z(O(G=Yw-<P$OW9l`l^6O0yKwH7?1Vws(@oSidC_m4dD3ys?s4$VqJv0uTo$@S7RCv
za07!q0fskwQZF!!=MmPg_=%a)Ky1Smd`K#D3jG*GEzy6%N7PCIaR`mXU@CudbPaq)
zwrpUGtob&uBKeMb8Q`WIV{c-roQp6&ZR6#98Q@T2<TXa}%0A}lRV*c;ep?1OfQ2yd
zBgy3=?qGY%{vCK1d)}AL;iZCHHL<(p%rKr{vTT*E!K)TX9lv6LH*pP{V}Bp^{Zr$|
z6ghy$5zahs7jZChJ>B(a!&#ij(ckaT3JbW1FWA@>5c}isM2mhygsuoU745RK>)Rr^
zW+oEdV9duN*l!GUOid1OE)3koN?eWtDS|CwZ&$UD156E#;ZX-z4ZFH7z5?KxL^p~T
z(FTq9zQpNeUu|tddb8IL<Rak1yoRk3c(^K9mSz3|Aco6atsH3V00000NkvXXu0mjf
DLUZ}s

diff --git a/resources/images/impl/systray/envelopeMacOSXWhite.png b/resources/images/impl/systray/envelopeMacOSXWhite.png
deleted file mode 100644
index 2a11957f1a2cc351c361af537d9978b10f2035c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 554
zcmV+_0@eMAP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz%t=H+R7l6Y)<0+zK@`XF3lR$q2ntGs
zQ;Vdqvk+~RXpv5_vJuiK1Oz)#un;0*V__qRMG}=jP%t1ig4k#$YOSL92mF&LiJ+n+
zm-A!uz-8In+^)CxVA!3vGxKHM{N9_bq1NGcFz<V<0^qG~0ef%^&$<B|z&+f?`6_|i
za1%`|VFGKa0<On5|Lg)zVq;anBLSMlDU3z`cvZkr9L4JB&jfI+TPm&N1~x>vd%KZ`
zeVE1rOrpP2z&iG(b}@+O5!SEx844~9+>R^wkWl7Sq`?Rl68=y47`{@#!)VC1KN-FT
zKF51uU=QXLx9?F53In%fEcPa<%DD*h(-ym&D+8=27I}?BEo47{t5{Bi`fVBDTFl1+
zKN4rTh&$Mk8ov|oV$A!pXLu>+teV)9nlp$eQ3y(@bRAx$AWQfa1-yxIY>n}~*!RDQ
z--ls5j&Nq#A`Zk^PZud|XK^CKe}9Ekn8!tY!RB^>`(yI;lz&r%F3+YSU3L|@EoL%+
z{ZSwD>~|=-R`hzBjRo#v6)uNB@@yGH?Pwv(nY2+nS^>6z-R+7m4|pcw8^Mc6gGM}G
s;&jogtyM^`Rq%t{68JDHVLR3S0$?QRUJ<_fEdT%j07*qoM6N<$f=rn7`~Uy|

diff --git a/resources/images/impl/systray/envelopeWindows.png b/resources/images/impl/systray/envelopeWindows.png
deleted file mode 100644
index c0886c2e542e2e99c97689ae8758dc4e28683c0f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1431
zcmV;I1!($-P)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%IY~r8R7l6Ym1$6uR}_YwPWz{SaDgO%
zh>%2x2m}H~AV^}M8V~^`xS)wjMG%63OT`VX7ONn(1q;+l6|51l)eZ=boh~jjI9QaT
z;zF>jYNb^pJ0yAg-ESnNhPqH`X5KmXo_ppz-@Uo#o>2fs4c2gfv&Fn^z8;P_gMH8E
zrt`lk;2e?NiDfc}lK%zBVmpV(#rAb8=S;dZqChKKdlv@B^U&xiq1w-sHV^&0cn3xd
zXwUaM!*UCIV#Z$z;dDudw;NkyV`Kf!hyY!t%}{tRNrmOiO&BXmz<9O;EIh-XT5%>%
z91-BuAjPqHN$LFwa^J@I_v|0Cg0{d$c>*l=S?fjwxKu8?a5HCdZ~uNSo}8G4pop+m
zo6t?Lad0lSv$K7lI@)*NC@^(-K$-66&Cp#+gsvh6e|#T>Ns~AR|G?S$2(i0%ZG`l(
zr+<j_KLM$)e#^<zd%derblu6trAwWiq|@Elht7+uust!n`{RPsIQY{Yl*f5J`tu_n
zM98Ms3>)Ymlw`PzBt6Q66y%j(LGiDTk+DCkN40dOZguqhj*K%JWS;vSyMMfo^k`X=
zb|)Jt3TgAOfcApvlF*eKd%vh?L-xgo#>6|$-ow`NR%|F~Me?a;sJ>}J%<)FV#KknX
zf6B#1g<tdWqM}jH>!m<}Y(epsvSy@|wqnh9ElBvb39-eEh*CE|apX5FI9!k5ygG<7
zYr)@9171x2lj>bO-R3B9!?1w-Kt<_5;_!Vx7*ro5-rKW2uwieqPt*1|QR|A8VfUSs
zyZX6ntH4=v8TP94$Wpm!w#Eir9~O`+mVYhEyaD(4TwO?{{C>D9p;nm?bu%qlqPd;x
z(%*g584aH}>7v7?woaV8t=oE0A>yN?HL;7umxcwj^bDFeVOgPpyY32zIBS0aJK+K*
z#-0U#NoxD4WGC&@3@%zS{7{s>zUSb<eBCj%+E94-P$vb*q2%&fK)M_FM%LI-0Ndy?
z*eHs?3f>8Z&oVG2tH2IiWyssHrmM811R9M7ot>S~>-DrHbK<8!yI%;j6fKmpyu!a?
z2}2!dpu5c0lIPiI#pZ$OBm!fG3gZ_SV#4y1Q0_U2^XJZ?r>6%xoz6tWPu2&ZCP1dw
zd@*CPuiku$KYWFbT1R(bK2`K@v$(Eh=Hk_0hGxN1egM{s3g8@n9H&c5(b3U??(Xh?
z6<H^7<akYh3};Ex7~f=!6)eETERnwI=<@DxnOC#L6lw3cfDd62m~Mo|?op$zt`1tQ
zmR3ke2qNTiqsV+<t?tep0?aW1n)79JVx}+xSJOODc_gkka>>GeGcOg!h*K~antMo%
z2M->gt*wm)5W6ca4VioQ(zdU!&*&#{6tK}0I90A^1ZBWnx)E%itHIhO0Hn#930A<&
zJMkaTqv~U5X=$OAoRoxZsj2js{BJ~LPW)s{{1mX)1Zd%{)U)P(4hv~A7*2kdnH)j>
zIG%ssXxGTUp`t{L6UYq*zRcI%y?Yn+_4US`rEJ(hLx>&NX;)VlNZgP+v=Bx0GK147
zn7G_ni}sT_7Tjs)861xq>I1GaIUYq;c8;XJ@^0O_h1%L$I(cD10rqES(_>=EoQz3{
zkT?=Q)D9mp1i|g39lfkCQVICv_FcPn4b|1vXm4*HQiE<O-}IJxgx+Sj1)h18M*OUp
zcau7+s;WX|Wu=LT|Alo(UH{EYo{!&a0BI<BQOMB}Kt)9bZOMG#r6IY81ip@*dzf7*
l<x*-QxAB?HedagD{RM~H^3aHVwN(HB002ovPDHLkV1kU2#J2zd

diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
index a916b2b9b..119e00028 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
@@ -565,10 +565,6 @@ public void setActiveContact(MetaContact metaContact, boolean isActive)
         if (isActive)
         {
             activeContacts.add(contactNode);
-//              SystrayService stray = GuiActivator.getSystrayService();
-//
-//              if (stray != null)
-//                  stray.setSystrayIcon(SystrayService.ENVELOPE_IMG_TYPE);
         }
         else
             activeContacts.remove(contactNode);
diff --git a/src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java b/src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java
index f1a744d40..48d0f8c70 100644
--- a/src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java
+++ b/src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java
@@ -93,10 +93,6 @@ public class SystrayServiceJdicImpl
 
     private ImageIcon logoIconWhite;
 
-    private ImageIcon envelopeIcon;
-
-    private ImageIcon envelopeIconWhite;
-
     /**
      * The dock Icons used only in Mac version
      */
@@ -206,8 +202,6 @@ private void initSystray()
                 "service.systray.TRAY_ICON_WINDOWS_FFC");
             logoIconDND = Resources.getImage(
                 "service.systray.TRAY_ICON_WINDOWS_DND");
-            envelopeIcon = Resources.getImage(
-                "service.systray.MESSAGE_ICON_WINDOWS");
         }
         /*
          * If we're running under Mac OS X, we use special black and white icons
@@ -218,10 +212,6 @@ else if (isMac)
             logoIcon = Resources.getImage("service.systray.TRAY_ICON_MACOSX");
             logoIconWhite = Resources.getImage(
                 "service.systray.TRAY_ICON_MACOSX_WHITE");
-            envelopeIcon = Resources.getImage(
-                "service.systray.MESSAGE_ICON_MACOSX");
-            envelopeIconWhite = Resources.getImage(
-                "service.systray.MESSAGE_ICON_MACOSX_WHITE");
         }
         else
         {
@@ -233,7 +223,6 @@ else if (isMac)
                 "service.systray.TRAY_ICON_EXTENDED_AWAY");
             logoIconFFC = Resources.getImage("service.systray.TRAY_ICON_FFC");
             logoIconDND = Resources.getImage("service.systray.TRAY_ICON_DND");
-            envelopeIcon = Resources.getImage("service.systray.MESSAGE_ICON");
         }
 
         /*
@@ -296,11 +285,7 @@ public void actionPerformed(ActionEvent e)
                     {
                         public void popupMenuWillBecomeVisible(PopupMenuEvent e)
                         {
-                            ImageIcon newIcon
-                                = (currentIcon == envelopeIcon)
-                                    ? envelopeIconWhite
-                                    : logoIconWhite;
-
+                            ImageIcon newIcon = logoIconWhite;
                             trayIcon.setIcon(newIcon);
                             currentIcon = newIcon;
                         }
@@ -308,11 +293,7 @@ public void popupMenuWillBecomeVisible(PopupMenuEvent e)
                         public void popupMenuWillBecomeInvisible(
                                 PopupMenuEvent e)
                         {
-                            ImageIcon newIcon
-                                = (currentIcon == envelopeIconWhite)
-                                    ? envelopeIcon
-                                    : logoIcon;
-
+                            ImageIcon newIcon = logoIcon;
                             getTrayIcon().setIcon(newIcon);
                             currentIcon = newIcon;
                         }
@@ -402,12 +383,6 @@ public void setSystrayIcon(int imageType)
             if (!isMac)
                 systrayIconToSet = logoIconDND;
             break;
-        case SystrayService.ENVELOPE_IMG_TYPE:
-            systrayIconToSet
-                = (isMac && TrayMenuFactory.isVisible(menu))
-                    ? envelopeIconWhite
-                    : envelopeIcon;
-            break;
         }
 
         if (systrayIconToSet != null)
diff --git a/src/net/java/sip/communicator/service/systray/SystrayService.java b/src/net/java/sip/communicator/service/systray/SystrayService.java
index 751abc6af..4cabe2dc4 100644
--- a/src/net/java/sip/communicator/service/systray/SystrayService.java
+++ b/src/net/java/sip/communicator/service/systray/SystrayService.java
@@ -77,11 +77,6 @@ public interface SystrayService
      */
     public static final int SC_IMG_EXTENDED_AWAY_TYPE = 6;
 
-    /**
-     * Image type corresponding to the envelope icon
-     */
-    public static final int ENVELOPE_IMG_TYPE = 1;
-
     /**
      * Shows the given <tt>PopupMessage</tt>
      *