summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-04-06 20:16:57 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-04-06 20:37:15 (GMT)
commitf3e75e58e57e5a49a79da8a88d25f17c784812b6 (patch)
treee8e4857049212367441b4469937631cbe61f1178 /Swift/Controllers
parent725c4e1ad0710606421f9705d994688116a9fc1f (diff)
downloadswift-contrib-f3e75e58e57e5a49a79da8a88d25f17c784812b6.zip
swift-contrib-f3e75e58e57e5a49a79da8a88d25f17c784812b6.tar.bz2
Don't minimise+restore new chats that want focus on OS X.
Resolves: 217
Diffstat (limited to 'Swift/Controllers')
-rw-r--r--Swift/Controllers/Chat/ChatsManager.cpp1
-rw-r--r--Swift/Controllers/Chat/MUCController.cpp1
2 files changed, 0 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp
index db340ac..61d9bb4 100644
--- a/Swift/Controllers/Chat/ChatsManager.cpp
+++ b/Swift/Controllers/Chat/ChatsManager.cpp
@@ -138,7 +138,6 @@ void ChatsManager::setEnabled(bool enabled) {
void ChatsManager::handleChatRequest(const String &contact) {
ChatController* controller = getChatControllerOrFindAnother(JID(contact));
- controller->showChatWindow();
controller->activateChatWindow();
}
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp
index a1ca9cc..c726b7b 100644
--- a/Swift/Controllers/Chat/MUCController.cpp
+++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -47,7 +47,6 @@ MUCController::MUCController (
muc_->onOccupantPresenceChange.connect(boost::bind(&MUCController::handleOccupantPresenceChange, this, _1));
muc_->onOccupantLeft.connect(boost::bind(&MUCController::handleOccupantLeft, this, _1, _2, _3));
chatWindow_->convertToMUC();
- chatWindow_->show();
if (avatarManager_ != NULL) {
avatarChangedConnection_ = (avatarManager_->onAvatarChanged.connect(boost::bind(&MUCController::handleAvatarChanged, this, _1, _2)));
}