diff options
author | Kevin Smith <git@kismith.co.uk> | 2011-10-04 10:02:23 (GMT) |
---|---|---|
committer | Kevin Smith <git@kismith.co.uk> | 2011-10-04 10:03:16 (GMT) |
commit | 1f4be30a480818458fd841809585681597be831e (patch) | |
tree | 2480d96dce7e3e6df88cebbc3c9d82f922b4476b /Swift/Controllers/Chat/MUCController.cpp | |
parent | dc3ddc0d08cc48681e5d16866ef4fcc10819b2a1 (diff) | |
download | swift-1f4be30a480818458fd841809585681597be831e.zip swift-1f4be30a480818458fd841809585681597be831e.tar.bz2 |
Allow both instant and reserved rooms.
Resolves: #1006
Diffstat (limited to 'Swift/Controllers/Chat/MUCController.cpp')
-rw-r--r-- | Swift/Controllers/Chat/MUCController.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp index 87d5a16..d72c0f7 100644 --- a/Swift/Controllers/Chat/MUCController.cpp +++ b/Swift/Controllers/Chat/MUCController.cpp @@ -73,6 +73,7 @@ MUCController::MUCController ( chatWindow_->onOccupantActionSelected.connect(boost::bind(&MUCController::handleActionRequestedOnOccupant, this, _1, _2)); chatWindow_->onChangeSubjectRequest.connect(boost::bind(&MUCController::handleChangeSubjectRequest, this, _1)); chatWindow_->onConfigureRequest.connect(boost::bind(&MUCController::handleConfigureRequest, this, _1)); + chatWindow_->onConfigurationFormCancelled.connect(boost::bind(&MUCController::handleConfigurationCancelled, this)); chatWindow_->onDestroyRequest.connect(boost::bind(&MUCController::handleDestroyRoomRequest, this)); chatWindow_->onInvitePersonToThisMUCRequest.connect(boost::bind(&MUCController::handleInvitePersonToThisMUCRequest, this, _1, _2)); muc_->onJoinComplete.connect(boost::bind(&MUCController::handleJoinComplete, this, _1)); @@ -600,6 +601,10 @@ void MUCController::handleConfigurationFormReceived(Form::ref form) { chatWindow_->showRoomConfigurationForm(form); } +void MUCController::handleConfigurationCancelled() { + muc_->cancelConfigureRoom(); +} + void MUCController::handleDestroyRoomRequest() { muc_->destroyRoom(); } |