Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-12-31 22:12:28 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-12-31 22:12:28 (GMT) |
| commit | 9ad4cc1f2b5117268348cc5625be782f717ad081 (patch) | |
| tree | 919045e55ef0bf4d6d01a468aca483209185f04f /Swift | |
| parent | 437adabd3798dae0f1eeea0b4f8c2d4212a083e6 (diff) | |
| download | swift-9ad4cc1f2b5117268348cc5625be782f717ad081.zip swift-9ad4cc1f2b5117268348cc5625be782f717ad081.tar.bz2 | |
Fix the MUC PM routing again.
Resolves: #725
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/Controllers/Chat/ChatsManager.cpp | 3 | ||||
| -rw-r--r-- | Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp index 814d87d..722b98f 100644 --- a/Swift/Controllers/Chat/ChatsManager.cpp +++ b/Swift/Controllers/Chat/ChatsManager.cpp @@ -213,6 +213,9 @@ ChatController* ChatsManager::getChatControllerOrCreate(const JID &contact) { ChatController* ChatsManager::getChatControllerIfExists(const JID &contact) { if (chatControllers_.find(contact) == chatControllers_.end()) { + if (mucRegistry_->isMUC(contact.toBare())) { + return NULL; + } //Need to look for an unbound window to bind first JID bare(contact.toBare()); if (chatControllers_.find(bare) != chatControllers_.end()) { diff --git a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp index 042b7c6..6d20f70 100644 --- a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp +++ b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp @@ -239,14 +239,14 @@ public: uiEventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(JID(messageJIDString1)))); String messageJIDString2("testling@test.com/2"); - //ChatWindow* window2 = new MockChatWindow();//mocks_->InterfaceMock<ChatWindow>(); - //mocks_->ExpectCall(chatWindowFactory_, ChatWindowFactory::createChatWindow).With(JID(messageJIDString2), uiEventStream_).Return(window2); + ChatWindow* window2 = new MockChatWindow();//mocks_->InterfaceMock<ChatWindow>(); + mocks_->ExpectCall(chatWindowFactory_, ChatWindowFactory::createChatWindow).With(JID(messageJIDString2), uiEventStream_).Return(window2); uiEventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(JID(messageJIDString2)))); String messageJIDString3("testling@test.com/3"); - //ChatWindow* window3 = new MockChatWindow();//mocks_->InterfaceMock<ChatWindow>(); - //mocks_->ExpectCall(chatWindowFactory_, ChatWindowFactory::createChatWindow).With(JID(messageJIDString3), uiEventStream_).Return(window3); + ChatWindow* window3 = new MockChatWindow();//mocks_->InterfaceMock<ChatWindow>(); + mocks_->ExpectCall(chatWindowFactory_, ChatWindowFactory::createChatWindow).With(JID(messageJIDString3), uiEventStream_).Return(window3); uiEventStream_->send(boost::shared_ptr<UIEvent>(new RequestChatUIEvent(JID(messageJIDString3)))); |