Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-07-25 20:15:31 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-07-25 20:15:31 (GMT) |
| commit | 719127a8772f921fdba3169b449a4407143c8c45 (patch) | |
| tree | 143db01c914c14d5f5261393a8f2de4ecc18866b /Swift/Controllers | |
| parent | 501989d4b371c850a1c5a0350ca3f1c4900305f4 (diff) | |
| download | swift-contrib-719127a8772f921fdba3169b449a4407143c8c45.zip swift-contrib-719127a8772f921fdba3169b449a4407143c8c45.tar.bz2 | |
Preparation for merging presences in the chat log.
Diffstat (limited to 'Swift/Controllers')
| -rw-r--r-- | Swift/Controllers/Chat/ChatController.cpp | 2 | ||||
| -rw-r--r-- | Swift/Controllers/Chat/MUCController.cpp | 4 | ||||
| -rw-r--r-- | Swift/Controllers/UIInterfaces/ChatWindow.h | 1 | ||||
| -rw-r--r-- | Swift/Controllers/UnitTest/MockChatWindow.h | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp index 3012377..d9524da 100644 --- a/Swift/Controllers/Chat/ChatController.cpp +++ b/Swift/Controllers/Chat/ChatController.cpp @@ -113,7 +113,7 @@ void ChatController::handlePresenceChange(boost::shared_ptr<Presence> newPresenc chatStateTracker_->handlePresenceChange(newPresence, previousPresence); String newStatusChangeString = getStatusChangeString(newPresence); if (!previousPresence || newStatusChangeString != getStatusChangeString(previousPresence)) { - chatWindow_->addSystemMessage(newStatusChangeString); + chatWindow_->addPresenceMessage(newStatusChangeString); } } diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp index 405272e..1ea0ad1 100644 --- a/Swift/Controllers/Chat/MUCController.cpp +++ b/Swift/Controllers/Chat/MUCController.cpp @@ -178,7 +178,7 @@ void MUCController::handleOccupantJoined(const MUCOccupant& occupant) { } joinString += "."; - chatWindow_->addSystemMessage(joinString); + chatWindow_->addPresenceMessage(joinString); } if (avatarManager_ != NULL) { handleAvatarChanged(jid, "dummy"); @@ -266,7 +266,7 @@ void MUCController::handleOccupantLeft(const MUCOccupant& occupant, MUC::Leaving partMessage += " (" + reason + ")"; } partMessage += "."; - chatWindow_->addSystemMessage(partMessage); + chatWindow_->addPresenceMessage(partMessage); if (occupant.getNick() != nick_) { roster_->removeContact(JID(toJID_.getNode(), toJID_.getDomain(), occupant.getNick())); } else { diff --git a/Swift/Controllers/UIInterfaces/ChatWindow.h b/Swift/Controllers/UIInterfaces/ChatWindow.h index 50a0b39..79c7d65 100644 --- a/Swift/Controllers/UIInterfaces/ChatWindow.h +++ b/Swift/Controllers/UIInterfaces/ChatWindow.h @@ -31,6 +31,7 @@ namespace Swift { virtual void addMessage(const String& message, const String& senderName, bool senderIsSelf, const boost::optional<SecurityLabel>& label, const String& avatarPath, const boost::posix_time::ptime& time) = 0; virtual void addAction(const String& message, const String& senderName, bool senderIsSelf, const boost::optional<SecurityLabel>& label, const String& avatarPath, const boost::posix_time::ptime& time) = 0; virtual void addSystemMessage(const String& message) = 0; + virtual void addPresenceMessage(const String& message) = 0; virtual void addErrorMessage(const String& message) = 0; virtual void setContactChatState(ChatState::ChatStateType state) = 0; diff --git a/Swift/Controllers/UnitTest/MockChatWindow.h b/Swift/Controllers/UnitTest/MockChatWindow.h index ff61bf6..4985cbb 100644 --- a/Swift/Controllers/UnitTest/MockChatWindow.h +++ b/Swift/Controllers/UnitTest/MockChatWindow.h @@ -18,6 +18,7 @@ namespace Swift { virtual void addAction(const String& message, const String& /*senderName*/, bool /*senderIsSelf*/, const boost::optional<SecurityLabel>& /*label*/, const String& /*avatarPath*/, const boost::posix_time::ptime&) {lastMessageBody_ = message;}; virtual void addSystemMessage(const String& /*message*/) {}; virtual void addErrorMessage(const String& /*message*/) {}; + virtual void addPresenceMessage(const String& /*message*/) {}; virtual void setContactChatState(ChatState::ChatStateType /*state*/) {}; virtual void setName(const String& name) {name_ = name;}; |