Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2013-04-30 20:10:12 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2013-10-01 14:48:44 (GMT) |
| commit | fd47dd7d5cec5155b9985959d2f0e0f3b386cd98 (patch) | |
| tree | d4da57ce3f1c90f56701cab8757d75e089473c9e /Swift/Controllers/UIInterfaces/ChatWindow.h | |
| parent | a3781c5b770c03ff32c5cf8f1280b21c2a8e2626 (diff) | |
| download | swift-contrib-fd47dd7d5cec5155b9985959d2f0e0f3b386cd98.zip swift-contrib-fd47dd7d5cec5155b9985959d2f0e0f3b386cd98.tar.bz2 | |
Adding support for impromptu MUCs.
Change-Id: I363e9d740bbec311454827645f4ea6df8bb60bed
License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Diffstat (limited to 'Swift/Controllers/UIInterfaces/ChatWindow.h')
| -rw-r--r-- | Swift/Controllers/UIInterfaces/ChatWindow.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Swift/Controllers/UIInterfaces/ChatWindow.h b/Swift/Controllers/UIInterfaces/ChatWindow.h index 50f2f26..e6f61ca 100644 --- a/Swift/Controllers/UIInterfaces/ChatWindow.h +++ b/Swift/Controllers/UIInterfaces/ChatWindow.h @@ -31,5 +31,5 @@ namespace Swift { class ContactRosterItem; class FileTransferController; - class InviteToChatWindow; + class UserSearchWindow; @@ -117,5 +117,5 @@ namespace Swift { virtual void setFileTransferProgress(std::string, const int percentageDone) = 0; virtual void setFileTransferStatus(std::string, const FileTransferState state, const std::string& msg = "") = 0; - virtual void addMUCInvitation(const std::string& senderName, const JID& jid, const std::string& reason, const std::string& password, bool direct = true) = 0; + virtual void addMUCInvitation(const std::string& senderName, const JID& jid, const std::string& reason, const std::string& password, bool direct = true, bool isImpromptu = false, bool isContinuation = false) = 0; virtual std::string addWhiteboardRequest(bool senderIsSelf) = 0; @@ -133,5 +133,5 @@ namespace Swift { virtual void setCorrectionEnabled(Tristate enabled) = 0; virtual void setUnreadMessageCount(int count) = 0; - virtual void convertToMUC() = 0; + virtual void convertToMUC(bool impromptuMUC = false) = 0; // virtual TreeWidget *getTreeWidget() = 0; virtual void setSecurityLabelsError() = 0; @@ -147,4 +147,5 @@ namespace Swift { virtual void setAvailableRoomActions(const std::vector<RoomAction> &actions) = 0; virtual void setBlockingState(BlockingState state) = 0; + virtual void setCanInitiateImpromptuChats(bool supportsImpromptu) = 0; /** * Set an alert on the window. @@ -169,6 +170,4 @@ namespace Swift { virtual void showRoomConfigurationForm(Form::ref) = 0; - virtual InviteToChatWindow* createInviteToChatWindow() = 0; - boost::signal<void ()> onClosed; boost::signal<void ()> onAllMessagesRead; @@ -183,5 +182,5 @@ namespace Swift { boost::signal<void (Form::ref)> onConfigureRequest; boost::signal<void ()> onDestroyRequest; - boost::signal<void ()> onInvitePersonToThisMUCRequest; + boost::signal<void (const std::vector<JID>&)> onInviteToChat; boost::signal<void ()> onConfigurationFormCancelled; boost::signal<void ()> onGetAffiliationsRequest; |