summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-04-05 21:55:55 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-04-05 21:55:55 (GMT)
commit5e87304f8e31adeddcba41879057093e65047493 (patch)
tree48fa139eeefce402ebcb4d30adb30f01196ad1d5
parenta8ac900bfd39f36749b25d97b55f5a08a1020de5 (diff)
downloadswift-5e87304f8e31adeddcba41879057093e65047493.zip
swift-5e87304f8e31adeddcba41879057093e65047493.tar.bz2
Re-use Chat controllers when opening a new chat.
Resolves: #282
-rw-r--r--Swift/Controllers/Chat/ChatsManager.cpp36
-rw-r--r--Swift/Controllers/Chat/ChatsManager.h5
2 files changed, 34 insertions, 7 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp
index 8c49cd6..db340ac 100644
--- a/Swift/Controllers/Chat/ChatsManager.cpp
+++ b/Swift/Controllers/Chat/ChatsManager.cpp
@@ -137,20 +137,44 @@ void ChatsManager::setEnabled(bool enabled) {
}
void ChatsManager::handleChatRequest(const String &contact) {
- ChatController* controller = getChatController(JID(contact));
+ ChatController* controller = getChatControllerOrFindAnother(JID(contact));
controller->showChatWindow();
controller->activateChatWindow();
}
-ChatController* ChatsManager::getChatController(const JID &contact) {
+ChatController* ChatsManager::getChatControllerOrFindAnother(const JID &contact) {
+ ChatController* controller = getChatControllerIfExists(contact);
+ if (!controller) {
+ foreach (JIDChatControllerPair pair, chatControllers_) {
+ if (pair.first.toBare() == contact.toBare()) {
+ controller = pair.second;
+ break;
+ }
+ }
+ }
+ return controller ? controller : createNewChatController(contact);
+}
+
+ChatController* ChatsManager::createNewChatController(const JID& contact) {
+ ChatController* controller = new ChatController(jid_, stanzaChannel_, iqRouter_, chatWindowFactory_, contact, nickResolver_, presenceOracle_, avatarManager_);
+ chatControllers_[contact] = controller;
+ controller->setAvailableServerFeatures(serverDiscoInfo_);
+ return controller;
+}
+
+ChatController* ChatsManager::getChatControllerOrCreate(const JID &contact) {
+ ChatController* controller = getChatControllerIfExists(contact);
+ return controller ? controller : createNewChatController(contact);
+}
+
+ChatController* ChatsManager::getChatControllerIfExists(const JID &contact) {
if (chatControllers_.find(contact) == chatControllers_.end()) {
- //Need to look for an unboud window to bind first
+ //Need to look for an unbound window to bind first
JID bare(contact.toBare());
if (chatControllers_.find(bare) != chatControllers_.end()) {
rebindControllerJID(bare, contact);
} else {
- chatControllers_[contact] = new ChatController(jid_, stanzaChannel_, iqRouter_, chatWindowFactory_, contact, nickResolver_, presenceOracle_, avatarManager_);
- chatControllers_[contact]->setAvailableServerFeatures(serverDiscoInfo_);
+ return NULL;
}
}
return chatControllers_[contact];
@@ -197,7 +221,7 @@ void ChatsManager::handleIncomingMessage(boost::shared_ptr<Message> message) {
//if not a mucroom
eventController_->handleIncomingEvent(event);
- getChatController(jid)->handleIncomingMessage(event);
+ getChatControllerOrCreate(jid)->handleIncomingMessage(event);
}
bool ChatsManager::isMUC(const JID& jid) const {
diff --git a/Swift/Controllers/Chat/ChatsManager.h b/Swift/Controllers/Chat/ChatsManager.h
index 575be5f..bcbe9eb 100644
--- a/Swift/Controllers/Chat/ChatsManager.h
+++ b/Swift/Controllers/Chat/ChatsManager.h
@@ -46,7 +46,10 @@ namespace Swift {
void handleMUCBookmarkAdded(boost::shared_ptr<MUCBookmark> bookmark);
void handleMUCBookmarkRemoved(boost::shared_ptr<MUCBookmark> bookmark);
void handleUserLeftMUC(MUCController* mucController);
- ChatController* getChatController(const JID &contact);
+ ChatController* getChatControllerOrFindAnother(const JID &contact);
+ ChatController* createNewChatController(const JID &contact);
+ ChatController* getChatControllerOrCreate(const JID &contact);
+ ChatController* getChatControllerIfExists(const JID &contact);
virtual bool isMUC(const JID& muc) const;
std::map<JID, MUCController*> mucControllers_;