Some safety checks and disable sip tests.

cusax-fix
Damian Minkov 16 years ago
parent a2292d6d2b
commit a077246aee

@ -21,7 +21,6 @@ net.java.sip.communicator.slick.runner.TEST_LIST=ConfigurationServiceLick \
JabberProtocolProviderSlick \
YahooProtocolProviderSlick \
MsnProtocolProviderSlick \
SipProtocolProviderServiceLick \
GibberishProtocolProviderServiceLick \
RssProtocolProviderServiceLick \
PopupMessageHandlerSLick
@ -36,7 +35,7 @@ net.java.sip.communicator.slick.runner.TEST_LIST=ConfigurationServiceLick \
# because the addSuite calls are commented-out in start().
#
# MediaServiceLick because one of the 2 tests fails.
#
# SipProtocolProviderServiceLick
#
# GenericProtocolProviderServiceLick because it does not add any tests.
#

@ -67,8 +67,9 @@ public StatusSelector(SystrayServiceJdicImpl jdicSystray,
if (swing)
{
JMenu menu = new JMenu(text);
menu.setIcon(new ImageIcon(presence.getPresenceStatus()
.getStatusIcon()));
byte[] icBytes = presence.getPresenceStatus().getStatusIcon();
if(icBytes != null)
menu.setIcon(new ImageIcon(icBytes));
this.menu = menu;
}
@ -90,8 +91,11 @@ public StatusSelector(SystrayServiceJdicImpl jdicSystray,
if (menu instanceof Container)
{
ImageIcon icon = new ImageIcon(status.getStatusIcon());
JMenuItem item = new JMenuItem(text, icon);
JMenuItem item = new JMenuItem(text);
byte[] icBytes = status.getStatusIcon();
if(icBytes != null)
item.setIcon(new ImageIcon(icBytes));
item.addActionListener(this);

Loading…
Cancel
Save