1 files changed, 10 insertions, 5 deletions
diff --git a/Swiften/MUC/MUC.cpp b/Swiften/MUC/MUC.cpp
index 15355ad..204fdcc 100644
--- a/Swiften/MUC/MUC.cpp
+++ b/Swiften/MUC/MUC.cpp
@@ -205,84 +205,89 @@ void MUC::handleIncomingPresence(Presence::ref presence) {
 				if (createAsReservedIfNew) {
 					unlocking = true;
 					requestConfigurationForm();
 				}
 				else {
 					MUCOwnerPayload::ref mucPayload(new MUCOwnerPayload());
 					presenceSender->addDirectedPresenceReceiver(ownMUCJID, DirectedPresenceSender::DontSendPresence);
 					mucPayload->setPayload(boost::make_shared<Form>(Form::SubmitType));
 					GenericRequest<MUCOwnerPayload>* request = new GenericRequest<MUCOwnerPayload>(IQ::Set, getJID(), mucPayload, iqRouter_);
 					request->onResponse.connect(boost::bind(&MUC::handleCreationConfigResponse, this, _1, _2));
 					request->send();
 				}
 			}
 		}
 	}
 }
 
 void MUC::handleCreationConfigResponse(MUCOwnerPayload::ref /*unused*/, ErrorPayload::ref error) {
 	unlocking = false;
 	if (error) {
 		presenceSender->removeDirectedPresenceReceiver(ownMUCJID, DirectedPresenceSender::AndSendPresence);
 		onJoinFailed(error);
 	} else {
 		onJoinComplete(getOwnNick()); /* Previously, this wasn't needed here, as the presence duplication bug caused an emit elsewhere. */
 	}
 }
 
 bool MUC::hasOccupant(const std::string& nick) {
 	return occupants.find(nick) != occupants.end();
 }
 
 MUCOccupant MUC::getOccupant(const std::string& nick) {
 	return occupants.find(nick)->second;
 }
 
-void MUC::kickUser(const JID& jid) {
+void MUC::kickOccupant(const JID& jid) {
+	changeOccupantRole(jid, MUCOccupant::NoRole);
+}
+
+void MUC::changeOccupantRole(const JID& jid, MUCOccupant::Role role) {
 	MUCAdminPayload::ref mucPayload = boost::make_shared<MUCAdminPayload>();
 	MUCItem item;
-	item.role = MUCOccupant::NoRole;
+	item.role = role;
 	item.nick = jid.getResource();
 	mucPayload->addItem(item);
 	GenericRequest<MUCAdminPayload>* request = new GenericRequest<MUCAdminPayload>(IQ::Set, getJID(), mucPayload, iqRouter_);
-	request->onResponse.connect(boost::bind(&MUC::handleKickResponse, this, _1, _2, jid));
+	request->onResponse.connect(boost::bind(&MUC::handleOccupantRoleChangeResponse, this, _1, _2, jid, role));
 	request->send();
+	
 }
 
-void MUC::handleKickResponse(MUCAdminPayload::ref /*unused*/, ErrorPayload::ref error, const JID& jid) {
+void MUC::handleOccupantRoleChangeResponse(MUCAdminPayload::ref /*unused*/, ErrorPayload::ref error, const JID& jid, MUCOccupant::Role role) {
 	if (error) {
-		onKickFailed(error, jid);
+		onRoleChangeFailed(error, jid, role);
 	}
 }
 
 void MUC::changeSubject(const std::string& subject) {
 	Message::ref message = boost::make_shared<Message>();
 	message->setSubject(subject);
 	message->setType(Message::Groupchat);
 	message->setTo(ownMUCJID.toBare());
 	stanzaChannel->sendMessage(message);
 }
 
 void MUC::requestConfigurationForm() {
 	MUCOwnerPayload::ref mucPayload(new MUCOwnerPayload());
 	GenericRequest<MUCOwnerPayload>* request = new GenericRequest<MUCOwnerPayload>(IQ::Get, getJID(), mucPayload, iqRouter_);
 	request->onResponse.connect(boost::bind(&MUC::handleConfigurationFormReceived, this, _1, _2));
 	request->send();
 }
 
 void MUC::cancelConfigureRoom() {
 	MUCOwnerPayload::ref mucPayload(new MUCOwnerPayload());
 	mucPayload->setPayload(boost::make_shared<Form>(Form::CancelType));
 	GenericRequest<MUCOwnerPayload>* request = new GenericRequest<MUCOwnerPayload>(IQ::Set, getJID(), mucPayload, iqRouter_);
 	request->send();
 }
 
 void MUC::handleConfigurationFormReceived(MUCOwnerPayload::ref payload, ErrorPayload::ref error) {
 	Form::ref form;
 	if (payload) {
 		form = payload->getForm();
 	}
 	if (error || !form) {
 		onConfigurationFailed(error);
 	} else {
 		onConfigurationFormReceived(form);
 	}