1 files changed, 6 insertions, 2 deletions
diff --git a/Swift/Controllers/UIInterfaces/ChatWindow.h b/Swift/Controllers/UIInterfaces/ChatWindow.h
index 8273802..13cbb7d 100644
--- a/Swift/Controllers/UIInterfaces/ChatWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatWindow.h
@@ -1,65 +1,67 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/optional.hpp>
 #include <boost/signals2.hpp>
 
 #include <Swiften/Base/Tristate.h>
 #include <Swiften/Elements/ChatState.h>
 #include <Swiften/Elements/Form.h>
 #include <Swiften/Elements/MUCOccupant.h>
 #include <Swiften/Elements/SecurityLabelsCatalog.h>
 #include <Swiften/MUC/MUCBookmark.h>
 
 #include <Swift/Controllers/Highlighting/HighlightManager.h>
 
 namespace Swift {
     class AvatarManager;
     class TreeWidget;
     class Roster;
     class TabComplete;
     class RosterItem;
     class ContactRosterItem;
     class FileTransferController;
     class UserSearchWindow;
+    class DiscoInfo;
+    class ErrorPayload;
 
 
     class ChatWindow {
         public:
             class ChatMessagePart {
                 public:
                     virtual ~ChatMessagePart() {}
             };
 
             class ChatMessage {
                 public:
                     ChatMessage() {}
 
                     ChatMessage(const std::string& text) {
                         append(std::make_shared<ChatTextMessagePart>(text));
                     }
 
                     void append(const std::shared_ptr<ChatMessagePart>& part) {
                         parts_.push_back(part);
                     }
 
                     const std::vector<std::shared_ptr<ChatMessagePart> >& getParts() const {
                         return parts_;
                     }
 
                     void setParts(const std::vector<std::shared_ptr<ChatMessagePart> >& parts) {
                         parts_ = parts;
                     }
 
                     void setHighlightActionSender(const HighlightAction& action) {
@@ -192,60 +194,63 @@ namespace Swift {
             virtual void setMessageReceiptState(const std::string& id, ChatWindow::ReceiptState state) = 0;
 
             virtual void setContactChatState(ChatState::ChatStateType state) = 0;
             virtual void setName(const std::string& name) = 0;
             virtual void show() = 0;
             virtual bool isVisible() const = 0;
             virtual void activate() = 0;
             virtual void setAvailableSecurityLabels(const std::vector<SecurityLabelsCatalog::Item>& labels) = 0;
             virtual void setSecurityLabelsEnabled(bool enabled) = 0;
             virtual void setCorrectionEnabled(Tristate enabled) = 0;
             virtual void setFileTransferEnabled(Tristate enabled) = 0;
             virtual void setUnreadMessageCount(int count) = 0;
             virtual void convertToMUC(MUCType mucType) = 0;
 //            virtual TreeWidget *getTreeWidget() = 0;
             virtual void setSecurityLabelsError() = 0;
             virtual SecurityLabelsCatalog::Item getSelectedSecurityLabel() = 0;
             virtual void setOnline(bool online) = 0;
             virtual void setRosterModel(Roster* model) = 0;
             virtual void setTabComplete(TabComplete* completer) = 0;
             virtual void replaceLastMessage(const ChatMessage& message, const TimestampBehaviour timestampBehaviour) = 0;
             virtual void setAckState(const std::string& id, AckState state) = 0;
             virtual void flash() = 0;
             virtual void setSubject(const std::string& subject) = 0;
             virtual void setAffiliations(MUCOccupant::Affiliation, const std::vector<JID>&) = 0;
             virtual void setAvailableRoomActions(const std::vector<RoomAction> &actions) = 0;
             virtual void setBlockingState(BlockingState state) = 0;
             virtual void setCanInitiateImpromptuChats(bool supportsImpromptu) = 0;
             virtual void showBookmarkWindow(const MUCBookmark& bookmark) = 0;
             virtual void setBookmarkState(RoomBookmarkState bookmarkState) = 0;
 
+            virtual void setChatSecurityMarking(const std::string& markingValue, const std::string& markingForegroundColorValue, const std::string& markingBackgroundColorValue) = 0;
+            virtual void removeChatSecurityMarking() = 0;
+
             /**
              * A handle that uniquely identities an alert message.
              */
             typedef int AlertID;
             /**
              * Set an alert on the window.
              * @param alertText Description of alert (required).
              * @return A handle to the alert message.
              */
             virtual AlertID addAlert(const std::string& alertText) = 0;
             /**
              * Removes an alert.
              * @param id An alert ID previously returned from setAlert
              */
             virtual void removeAlert(const AlertID id) = 0;
 
             /**
              * Actions that can be performed on the selected occupant.
              */
             virtual void setAvailableOccupantActions(const std::vector<OccupantAction>& actions) = 0;
 
             /**
              * A room configuration has been requested, show the form.
              * If the form is cancelled, must emit onConfigurationFormCancelled().
              */
             virtual void showRoomConfigurationForm(Form::ref) = 0;
 
             boost::signals2::signal<void ()> onClosed;
             boost::signals2::signal<void ()> onAllMessagesRead;
             boost::signals2::signal<void (const std::string&, bool isCorrection)> onSendMessageRequest;
@@ -255,31 +260,30 @@ namespace Swift {
             boost::signals2::signal<void ()> onAlertButtonClicked;
             boost::signals2::signal<void (ContactRosterItem*)> onOccupantSelectionChanged;
             boost::signals2::signal<void (ChatWindow::OccupantAction, ContactRosterItem*)> onOccupantActionSelected;
             boost::signals2::signal<void (const std::string&)> onChangeSubjectRequest;
             boost::signals2::signal<void ()> onBookmarkRequest;
             boost::signals2::signal<void (Form::ref)> onConfigureRequest;
             boost::signals2::signal<void ()> onDestroyRequest;
             boost::signals2::signal<void (const std::vector<JID>&)> onInviteToChat;
             boost::signals2::signal<void ()> onConfigurationFormCancelled;
             boost::signals2::signal<void ()> onGetAffiliationsRequest;
             boost::signals2::signal<void (MUCOccupant::Affiliation, const JID&)> onSetAffiliationRequest;
             boost::signals2::signal<void (const std::vector<std::pair<MUCOccupant::Affiliation, JID> >& changes)> onChangeAffiliationsRequest;
             boost::signals2::signal<void ()> onContinuationsBroken;
 
             // File transfer related
             boost::signals2::signal<void (std::string /* id */)> onFileTransferCancel;
             boost::signals2::signal<void (std::string /* id */, std::string /* description */)> onFileTransferStart;
             boost::signals2::signal<void (std::string /* id */, std::string /* path */)> onFileTransferAccept;
             boost::signals2::signal<void (std::string /* path */)> onSendFileRequest;
 
             //Whiteboard related
             boost::signals2::signal<void ()> onWhiteboardSessionAccept;
             boost::signals2::signal<void ()> onWhiteboardSessionCancel;
             boost::signals2::signal<void ()> onWhiteboardWindowShow;
 
             // Blocking Command related
             boost::signals2::signal<void ()> onBlockUserRequest;
             boost::signals2::signal<void ()> onUnblockUserRequest;
     };
 }
-