1. Improve status messages (incoming and outgoing)

2. Fix systrayservice not to throw an exception if not initialized

1 files changed, 4 insertions, 1 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
index a7510eb..aa47bd8 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
@@ -143,12 +143,15 @@ public class ContactListCellRenderer extends JPanel
                 
                 String contactDisplayName = protocolContact.getDisplayName();
                 String contactAddress = protocolContact.getAddress();
+                String statusMessage = protocolContact.getStatusMessage();
                 toolTipText
                     += "<br>"
                         + ((!contactDisplayName
                                 .equals(contactAddress))
                             ? contactDisplayName + " ("+contactAddress + ")"
-                                    : contactDisplayName);
+                                    : contactDisplayName)
+                        + ((statusMessage != null && statusMessage.length() > 0) 
+                            ? " - " + statusMessage : "");
             }
             this.buttonsPanel.setPreferredSize(
                     new Dimension(buttonsPanelWidth, 16));