Commit 7f4dcf64 authored by Matt Tucker's avatar Matt Tucker Committed by matt

Fixed null when status is null.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@421 b35dd754-fafc-0310-a699-88a17e54d16e
parent 3b3e348f
...@@ -166,38 +166,44 @@ user <b><%= address.getName() %></b> has multiple sessions open, they will appea ...@@ -166,38 +166,44 @@ user <b><%= address.getName() %></b> has multiple sessions open, they will appea
<td> <td>
<% <%
int show = currentSess.getPresence().getShow(); int show = currentSess.getPresence().getShow();
String statusTxt = currentSess.getPresence().getStatus();
if (statusTxt != null) {
statusTxt = " -- " + statusTxt;
}
else {
statusTxt = "";
}
if (show == Presence.SHOW_AWAY) { if (show == Presence.SHOW_AWAY) {
%> %>
<img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="Away"> <img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="Away">
Away - <%= currentSess.getPresence().getStatus() %> Away <%= statusTxt %>
<% <%
} else if (show == Presence.SHOW_CHAT) { } else if (show == Presence.SHOW_CHAT) {
%> %>
<img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Available to Chat"> <img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Available to Chat">
Available to Chat Available to Chat <%= statusTxt %>
<% <%
} else if (show == Presence.SHOW_DND) { } else if (show == Presence.SHOW_DND) {
%> %>
<img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Do not Disturb"> <img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Do not Disturb">
Do Not Disturb - <%= currentSess.getPresence().getStatus() %> Do Not Disturb <%= statusTxt %>
<% <%
} else if (show == Presence.SHOW_NONE) { } else if (show == Presence.SHOW_NONE) {
%> %>
<img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Online"> <img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Online">
Online Online <%= statusTxt %>
<% <%
} else if (show == Presence.SHOW_XA) { } else if (show == Presence.SHOW_XA) {
%> %>
<img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Extended Away"> <img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Extended Away">
Extended Away - <%= currentSess.getPresence().getStatus() %> Extended Away <%= statusTxt %>
<% <%
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment