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

Revert "Bump dependencies to libQuotient 0.7 (master)"

Browse Source 
This reverts commit d646962ea1.
This commit is contained in:
Tobias Fella
2021-02-16 21:14:47 +01:00
committed by Carl Schwan
parent 91ef8806f2
commit 345eb0c229
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -66,7 +66,7 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
find_package(KF5DBusAddons ${KF5_MIN_VERSION} REQUIRED) find_package(KF5DBusAddons ${KF5_MIN_VERSION} REQUIRED)
endif() endif()
find_package(Quotient 0.7) find_package(Quotient 0.6)
set_package_properties(Quotient PROPERTIES set_package_properties(Quotient PROPERTIES
TYPE REQUIRED TYPE REQUIRED
DESCRIPTION "Qt wrapper arround Matrix API" DESCRIPTION "Qt wrapper arround Matrix API"

4
src/neochatroom.cpp
View File

@@ -412,7 +412,9 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
} }
if (!e.newAvatarUrl().has_value()) { if (!e.newAvatarUrl().has_value()) {
text += i18n("cleared their avatar"); 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"); text += i18n("updated their avatar");
} }
} }

8
src/userlistmodel.cpp
View File

@@ -50,9 +50,7 @@ void UserListModel::setRoom(Quotient::Room *room)
std::sort(m_users.begin(), m_users.end(), room->memberSorter()); std::sort(m_users.begin(), m_users.end(), room->memberSorter());
} }
for (User *user : qAsConst(m_users)) { for (User *user : qAsConst(m_users)) {
connect(user, &User::defaultAvatarChanged, this, [this, &user]() { connect(user, &User::avatarChanged, this, &UserListModel::avatarChanged);
avatarChanged(user, m_currentRoom);
});
} }
connect(m_currentRoom->connection(), &Connection::loggedOut, this, [=] { connect(m_currentRoom->connection(), &Connection::loggedOut, this, [=] {
setRoom(nullptr); setRoom(nullptr);
@@ -151,9 +149,7 @@ void UserListModel::userAdded(Quotient::User *user)
beginInsertRows(QModelIndex(), pos, pos); beginInsertRows(QModelIndex(), pos, pos);
m_users.insert(pos, user); m_users.insert(pos, user);
endInsertRows(); endInsertRows();
connect(user, &User::defaultAvatarChanged, this, [this, &user]() { connect(user, &Quotient::User::avatarChanged, this, &UserListModel::avatarChanged);
avatarChanged(user, m_currentRoom);
});
} }
void UserListModel::userRemoved(Quotient::User *user) void UserListModel::userRemoved(Quotient::User *user)