ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Neochat compile against libQuotient 0.6

Browse Source
This commit is contained in:
Tobias Fella
2020-11-18 22:20:01 +01:00
committed by Carl Schwan
parent 516ad863b8
commit 4e2b68dc0a
7 changed files with 15 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/neochatroom.cpp
View File

@@ -317,17 +317,17 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
}
QString text {};
if (e.isRename()) {
if (e.newDisplayName()->isEmpty())
if (e.displayName().isEmpty())
text = i18n("cleared their display name");
else
text = i18n("changed their display name to %1", e.newDisplayName()->toHtmlEscaped());
text = i18n("changed their display name to %1", e.displayName().toHtmlEscaped());
}
if (e.isAvatarUpdate()) {
if (!text.isEmpty())
text += i18n(" and ");
if (!e.newAvatarUrl())
if (e.avatarUrl().isEmpty())
text += i18n("cleared their avatar");
else if (!e.prevContent()->avatarUrl)
else if (e.prevContent()->avatarUrl.isEmpty())
text += i18n("set an avatar");
else
text += i18n("updated their avatar");