Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2011-07-09 13:45:46 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2011-07-09 13:45:46 (GMT) |
| commit | dd6fe37580c5a0d9426312287cb4ed31116d8c4c (patch) | |
| tree | 18d3fce2bda00090fc9a6b94922c6b87e192fb8b /Swift/Controllers/Chat/ChatsManager.h | |
| parent | c2dc47077e505ba1d45f203772dc6aa4f26656e4 (diff) | |
| download | swift-dd6fe37580c5a0d9426312287cb4ed31116d8c4c.zip swift-dd6fe37580c5a0d9426312287cb4ed31116d8c4c.tar.bz2 | |
Keep MUCs in the recent chats list.
Populate them with Available StatusShow::Type when they're joined, and None when they're not.
Resolves: #907
Diffstat (limited to 'Swift/Controllers/Chat/ChatsManager.h')
| -rw-r--r-- | Swift/Controllers/Chat/ChatsManager.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.h b/Swift/Controllers/Chat/ChatsManager.h index be6e575..a8dd599 100644 --- a/Swift/Controllers/Chat/ChatsManager.h +++ b/Swift/Controllers/Chat/ChatsManager.h @@ -23,6 +23,7 @@ namespace Swift { class EventController; class ChatController; + class ChatControllerBase; class MUCController; class MUCManager; class ChatWindowFactory; @@ -51,9 +52,9 @@ namespace Swift { void setOnline(bool enabled); void setServerDiscoInfo(boost::shared_ptr<DiscoInfo> info); void handleIncomingMessage(boost::shared_ptr<Message> message); - ChatListWindow::Chat createChatListChatItem(const JID& jid, const std::string& activity); private: + ChatListWindow::Chat createChatListChatItem(const JID& jid, const std::string& activity); void handleChatRequest(const std::string& contact); void handleJoinMUCRequest(const JID& muc, const boost::optional<std::string>& nick, bool addAutoJoin); void handleSearchMUCRequest(); @@ -65,7 +66,7 @@ namespace Swift { void handleMUCBookmarkRemoved(const MUCBookmark& bookmark); void handleUserLeftMUC(MUCController* mucController); void handleBookmarksReady(); - void handleChatActivity(const JID& jid, const std::string& activity); + void handleChatActivity(const JID& jid, const std::string& activity, bool isMUC); void appendRecent(const ChatListWindow::Chat& chat); void prependRecent(const ChatListWindow::Chat& chat); void setupBookmarks(); @@ -74,7 +75,7 @@ namespace Swift { void handleChatMadeRecent(); void handleMUCBookmarkActivated(const MUCBookmark&); void handleRecentActivated(const ChatListWindow::Chat&); - void handleUnreadCountChanged(ChatController* controller); + void handleUnreadCountChanged(ChatControllerBase* controller); ChatController* getChatControllerOrFindAnother(const JID &contact); ChatController* createNewChatController(const JID &contact); |