Fixes banning chat room members.

fix-message-formatting 5158
Damian Minkov 12 years ago
parent 132a76f916
commit f4911ad573

@ -74,6 +74,7 @@ service.gui.AUTHORIZATION_RESPONSE=Authorization response
service.gui.AWAY_STATUS=Away
service.gui.EXTENDED_AWAY_STATUS=Extended Away
service.gui.BAN=&Ban
service.gui.BANNED=banned
service.gui.BAN_FAILED=Ban failed
service.gui.BAN_FAILED_GENERAL_ERROR=Failed to ban {0}. A general server error occurred.
service.gui.BAN_FAILED_NOT_ALLOWED=Failed to ban {0}. The owner and the administrator of the room could not be banned.

@ -316,7 +316,7 @@ else if (menuItemName.equals("banItem"))
ChatOperationReasonDialog reasonDialog
= new ChatOperationReasonDialog();
int result = new ChatOperationReasonDialog().showDialog();
int result = reasonDialog.showDialog();
if (result == MessageDialog.OK_RETURN_CODE)
new BanParticipantThread( room,

@ -639,6 +639,10 @@ public String getRoleDescription(ChatRoomMemberRole role)
= GuiActivator.getResources().getI18NString(
"service.gui.SILENT_MEMBER");
break;
case OUTCAST: roleDescription
= GuiActivator.getResources().getI18NString(
"service.gui.BANNED");
break;
default:;
}

@ -163,8 +163,11 @@ public void actionPerformed(ActionEvent e)
if (status.getStatusName().equals(menuItemText))
{
GuiActivator.getGlobalStatusService()
.publishStatus(protocolProvider, status);
if(GuiActivator.getGlobalStatusService() != null)
{
GuiActivator.getGlobalStatusService()
.publishStatus(protocolProvider, status);
}
setSelectedStatus(status);

@ -1562,7 +1562,9 @@ public void banParticipant(ChatRoomMember chatRoomMember, String reason)
{
try
{
multiUserChat.banUser(chatRoomMember.getContactAddress(), reason);
multiUserChat.banUser(
((ChatRoomMemberJabberImpl)chatRoomMember).getJabberID(),
reason);
}
catch (XMPPException e)
{

Loading…
Cancel
Save