vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated to be able to compile. :( 

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6243 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Gaston Dombiak 2006-11-28 19:26:54 +00:00 committed by gato
parent 4279a4acf8
commit a58e1dd0a4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/org/jivesoftware/smackx/muc/MultiUserChat.java
View File

@ -1789,7 +1789,7 @@ public class MultiUserChat {
* @throws XMPPException if sending the message fails. * @throws XMPPException if sending the message fails.
*/ */
public void sendMessage(String text) throws XMPPException { public void sendMessage(String text) throws XMPPException {
Message message = new Message(room, Message.Type.GROUP_CHAT); Message message = new Message(room, Message.Type.groupchat);
message.setBody(text); message.setBody(text);
connection.sendPacket(message); connection.sendPacket(message);
} }
@ -1804,7 +1804,7 @@ public class MultiUserChat {
* @return new Chat for sending private messages to a given room occupant. * @return new Chat for sending private messages to a given room occupant.
*/ */
public Chat createPrivateChat(String occupant) { public Chat createPrivateChat(String occupant) {
return new Chat(connection, occupant); return connection.getChatManager().createChat(occupant, null);
} }
/** /**
@ -1813,7 +1813,7 @@ public class MultiUserChat {
* @return a new Message addressed to the chat room. * @return a new Message addressed to the chat room.
*/ */
public Message createMessage() { public Message createMessage() {
return new Message(room, Message.Type.GROUP_CHAT); return new Message(room, Message.Type.groupchat);
} }
/** /**
@ -1901,7 +1901,7 @@ public class MultiUserChat {
* room subject will throw an error with code 403 (i.e. Forbidden) * room subject will throw an error with code 403 (i.e. Forbidden)
*/ */
public void changeSubject(final String subject) throws XMPPException { public void changeSubject(final String subject) throws XMPPException {
Message message = new Message(room, Message.Type.GROUP_CHAT); Message message = new Message(room, Message.Type.groupchat);
message.setSubject(subject); message.setSubject(subject);
// Wait for an error or confirmation message back from the server. // Wait for an error or confirmation message back from the server.
PacketFilter responseFilter = PacketFilter responseFilter =
@ -2078,7 +2078,7 @@ public class MultiUserChat {
messageFilter = messageFilter =
new AndFilter( new AndFilter(
new FromMatchesFilter(room), new FromMatchesFilter(room),
new MessageTypeFilter(Message.Type.GROUP_CHAT)); new MessageTypeFilter(Message.Type.groupchat));
messageFilter = new AndFilter(messageFilter, new PacketFilter() { messageFilter = new AndFilter(messageFilter, new PacketFilter() {
public boolean accept(Packet packet) { public boolean accept(Packet packet) {
Message msg = (Message) packet; Message msg = (Message) packet;
@ -2171,7 +2171,7 @@ public class MultiUserChat {
MUCUser mucUser = getMUCUserExtension(packet); MUCUser mucUser = getMUCUserExtension(packet);
// Check if the MUCUser informs that the invitee has declined the invitation // Check if the MUCUser informs that the invitee has declined the invitation
if (mucUser.getDecline() != null && if (mucUser.getDecline() != null &&
((Message) packet).getType() != Message.Type.ERROR) { ((Message) packet).getType() != Message.Type.error) {
// Fire event for invitation rejection listeners // Fire event for invitation rejection listeners
fireInvitationRejectionListeners( fireInvitationRejectionListeners(
mucUser.getDecline().getFrom(), mucUser.getDecline().getFrom(),
@ -2659,7 +2659,7 @@ public class MultiUserChat {
(MUCUser) packet.getExtension("x", "http://jabber.org/protocol/muc#user"); (MUCUser) packet.getExtension("x", "http://jabber.org/protocol/muc#user");
// Check if the MUCUser extension includes an invitation // Check if the MUCUser extension includes an invitation
if (mucUser.getInvite() != null && if (mucUser.getInvite() != null &&
((Message) packet).getType() != Message.Type.ERROR) { ((Message) packet).getType() != Message.Type.error) {
// Fire event for invitation listeners // Fire event for invitation listeners
fireInvitationListeners(packet.getFrom(), mucUser.getInvite().getFrom(), fireInvitationListeners(packet.getFrom(), mucUser.getInvite().getFrom(),
mucUser.getInvite().getReason(), mucUser.getPassword(), (Message) packet); mucUser.getInvite().getReason(), mucUser.getPassword(), (Message) packet);