1 files changed, 9 insertions, 4 deletions
diff --git a/Swift/Controllers/UIInterfaces/ChatWindow.h b/Swift/Controllers/UIInterfaces/ChatWindow.h
index 8273802..1c36ffc 100644
--- a/Swift/Controllers/UIInterfaces/ChatWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatWindow.h
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
@@ -31,10 +31,12 @@ namespace Swift {
     class TabComplete;
     class RosterItem;
     class ContactRosterItem;
     class FileTransferController;
     class UserSearchWindow;
+    class DiscoInfo;
+    class ErrorPayload;
 
 
     class ChatWindow {
         public:
             class ChatMessagePart {
@@ -137,11 +139,11 @@ namespace Swift {
 
 
             enum AckState {Pending, Received, Failed};
             enum ReceiptState {ReceiptRequested, ReceiptReceived, ReceiptFailed};
             enum OccupantAction {Kick, Ban, MakeModerator, MakeParticipant, MakeVisitor, AddContact, ShowProfile};
-            enum RoomAction {ChangeSubject, Configure, Affiliations, Destroy, Invite};
+            enum RoomAction {ChangeSubject, Configure, Affiliations, Destroy, Invite, Leave};
             enum FileTransferState {
                 Initialisation,     ///< Collecting information required for sending the request out.
                 WaitingForAccept,   ///< The file transfer request was send out.
                 Negotiating,        ///< The other party accepted the file transfer request and a suitable transfer method is negotiated.
                 Transferring,       ///< The negotiation was successful and the file is currently transferred.
@@ -198,11 +200,11 @@ namespace Swift {
             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 setUnreadMessageCount(size_t 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;
@@ -217,10 +219,13 @@ namespace Swift {
             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;
             /**
@@ -247,10 +252,11 @@ namespace Swift {
             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;
+            boost::signals2::signal<void (const std::string&)> onResendMessageRequest;
             boost::signals2::signal<void ()> onSendCorrectionMessageRequest;
             boost::signals2::signal<void ()> onUserTyping;
             boost::signals2::signal<void ()> onUserCancelsTyping;
             boost::signals2::signal<void ()> onAlertButtonClicked;
             boost::signals2::signal<void (ContactRosterItem*)> onOccupantSelectionChanged;
@@ -280,6 +286,5 @@ namespace Swift {
             // Blocking Command related
             boost::signals2::signal<void ()> onBlockUserRequest;
             boost::signals2::signal<void ()> onUnblockUserRequest;
     };
 }
-