Swiftdiff options
Diffstat (limited to 'Swift/Controllers/Chat/ChatsManager.cpp')
| -rw-r--r-- | Swift/Controllers/Chat/ChatsManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp index 343f490..8a06333 100644 --- a/Swift/Controllers/Chat/ChatsManager.cpp +++ b/Swift/Controllers/Chat/ChatsManager.cpp | |||
| @@ -285,11 +285,11 @@ ChatListWindow::Chat ChatsManager::updateChatStatusAndAvatarHelper(const ChatLis | |||
| 285 | } | 285 | } |
| 286 | } else { | 286 | } else { |
| 287 | if (avatarManager_) { | 287 | if (avatarManager_) { |
| 288 | fixedChat.avatarPath = avatarManager_->getAvatarPath(fixedChat.jid); | 288 | fixedChat.avatarPath = avatarManager_->getAvatarPath(fixedChat.jid); |
| 289 | } | 289 | } |
| 290 | Presence::ref presence = presenceOracle_->getHighestPriorityPresence(fixedChat.jid.toBare()); | 290 | Presence::ref presence = presenceOracle_->getAccountPresence(fixedChat.jid.toBare()); |
| 291 | fixedChat.statusType = presence ? presence->getShow() : StatusShow::None; | 291 | fixedChat.statusType = presence ? presence->getShow() : StatusShow::None; |
| 292 | } | 292 | } |
| 293 | return fixedChat; | 293 | return fixedChat; |
| 294 | } | 294 | } |
| 295 | 295 | ||
| @@ -407,11 +407,11 @@ ChatListWindow::Chat ChatsManager::createChatListChatItem(const JID& jid, const | |||
| 407 | ChatController* controller = getChatControllerIfExists(jid, false); | 407 | ChatController* controller = getChatControllerIfExists(jid, false); |
| 408 | if (controller) { | 408 | if (controller) { |
| 409 | unreadCount = controller->getUnreadCount(); | 409 | unreadCount = controller->getUnreadCount(); |
| 410 | } | 410 | } |
| 411 | JID bareishJID = mucRegistry_->isMUC(jid.toBare()) ? jid : jid.toBare(); | 411 | JID bareishJID = mucRegistry_->isMUC(jid.toBare()) ? jid : jid.toBare(); |
| 412 | Presence::ref presence = presenceOracle_->getHighestPriorityPresence(bareishJID); | 412 | Presence::ref presence = presenceOracle_->getAccountPresence(bareishJID); |
| 413 | StatusShow::Type type = presence ? presence->getShow() : StatusShow::None; | 413 | StatusShow::Type type = presence ? presence->getShow() : StatusShow::None; |
| 414 | boost::filesystem::path avatarPath = avatarManager_ ? avatarManager_->getAvatarPath(bareishJID) : boost::filesystem::path(); | 414 | boost::filesystem::path avatarPath = avatarManager_ ? avatarManager_->getAvatarPath(bareishJID) : boost::filesystem::path(); |
| 415 | return ChatListWindow::Chat(bareishJID, nickResolver_->jidToNick(bareishJID), activity, unreadCount, type, avatarPath, false, privateMessage); | 415 | return ChatListWindow::Chat(bareishJID, nickResolver_->jidToNick(bareishJID), activity, unreadCount, type, avatarPath, false, privateMessage); |
| 416 | } | 416 | } |
| 417 | } | 417 | } |