Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-26 23:36:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed display of the correct name in private Chat for offline chat messages.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3731 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-10-31 21:53:41 +00:00
parent 80492cfd48
commit 8852ca3c79
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View File

@ -560,6 +560,8 @@ void PopupChatDialog::onPrivateChatChanged(int list, int type, bool initial /*=
{ {
m_savedOfflineChat.clear(); m_savedOfflineChat.clear();
QString name = QString::fromUtf8(rsPeers->getPeerName(rsPeers->getOwnId()).c_str());
std::list<ChatInfo> offlineChat; std::list<ChatInfo> offlineChat;
if (rsMsgs->getPrivateChatQueueCount(false) && rsMsgs->getPrivateChatQueue(false, dialogId, offlineChat)) { if (rsMsgs->getPrivateChatQueueCount(false) && rsMsgs->getPrivateChatQueue(false, dialogId, offlineChat)) {
ui.actionClearOfflineMessages->setEnabled(true); ui.actionClearOfflineMessages->setEnabled(true);
@ -574,7 +576,6 @@ void PopupChatDialog::onPrivateChatChanged(int list, int type, bool initial /*=
m_savedOfflineChat.push_back(*it); m_savedOfflineChat.push_back(*it);
QString name = QString::fromStdString(rsPeers->getPeerName(it->rsid));
QDateTime sendTime = QDateTime::fromTime_t(it->sendTime); QDateTime sendTime = QDateTime::fromTime_t(it->sendTime);
QDateTime recvTime = QDateTime::fromTime_t(it->recvTime); QDateTime recvTime = QDateTime::fromTime_t(it->recvTime);
QString message = QString::fromStdWString(it->msg); QString message = QString::fromStdWString(it->msg);
@ -601,10 +602,11 @@ void PopupChatDialog::onPrivateChatChanged(int list, int type, bool initial /*=
case NOTIFY_TYPE_DEL: case NOTIFY_TYPE_DEL:
{ {
if (m_manualDelete == false) { if (m_manualDelete == false) {
QString name = QString::fromUtf8(rsPeers->getPeerName(rsPeers->getOwnId()).c_str());
// now show saved offline chat messages as sent // now show saved offline chat messages as sent
std::list<ChatInfo>::iterator it; std::list<ChatInfo>::iterator it;
for(it = m_savedOfflineChat.begin(); it != m_savedOfflineChat.end(); it++) { for(it = m_savedOfflineChat.begin(); it != m_savedOfflineChat.end(); it++) {
QString name = QString::fromStdString(rsPeers->getPeerName(it->rsid));
QDateTime sendTime = QDateTime::fromTime_t(it->sendTime); QDateTime sendTime = QDateTime::fromTime_t(it->sendTime);
QDateTime recvTime = QDateTime::fromTime_t(it->recvTime); QDateTime recvTime = QDateTime::fromTime_t(it->recvTime);
QString message = QString::fromStdWString(it->msg); QString message = QString::fromStdWString(it->msg);