diff options
author | Remko Tronçon <git@el-tramo.be> | 2010-10-30 19:55:41 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2010-10-30 19:57:00 (GMT) |
commit | 4804022049cb53ac28902639274826b68a803c18 (patch) | |
tree | b2a7439e15b409c66e051f2ec5e3ef4397591cbf /Swift/Controllers/MainController.cpp | |
parent | ba333999576d89f3340c271b2a3331d6a3e64ac7 (diff) | |
download | swift-contrib-4804022049cb53ac28902639274826b68a803c18.zip swift-contrib-4804022049cb53ac28902639274826b68a803c18.tar.bz2 |
When MUC notifications are clicked, open the MUC.
Release-Notes: When clicking notifications coming from rooms, bring up the room dialog.
Resolves: #674
Diffstat (limited to 'Swift/Controllers/MainController.cpp')
-rw-r--r-- | Swift/Controllers/MainController.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index 92a3f2a..4501f2c 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -56,6 +56,7 @@ #include "Swiften/StringCodecs/Hexify.h" #include "Swift/Controllers/UIEvents/RequestChatUIEvent.h" #include "Swift/Controllers/UIEvents/ToggleNotificationsUIEvent.h" +#include "Swift/Controllers/UIEvents/JoinMUCUIEvent.h" namespace Swift { @@ -509,7 +510,14 @@ void MainController::handleVCardReceived(const JID& jid, VCard::ref vCard) { void MainController::handleNotificationClicked(const JID& jid) { assert(chatsManager_); - uiEventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(jid))); + if (client_) { + if (client_->getMUCRegistry()->isMUC(jid)) { + uiEventStream_->send(boost::shared_ptr<JoinMUCUIEvent>(new JoinMUCUIEvent(jid))); + } + else { + uiEventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(jid))); + } + } } void MainController::handleQuitRequest() { |