From d646962ea10c19fd647be9f50ccbbb6d2a94583a Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Sat, 12 Dec 2020 15:39:29 +0100
Subject: [PATCH] Bump dependencies to libQuotient 0.7 (master)

---
 CMakeLists.txt        | 2 +-
 src/neochatroom.cpp   | 2 +-
 src/userlistmodel.cpp | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c112c31f..0190035e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@ else()
     find_package(KF5DBusAddons ${KF5_MIN_VERSION} REQUIRED)
 endif()
 
-find_package(Quotient 0.6)
+find_package(Quotient 0.7)
 set_package_properties(Quotient PROPERTIES
     TYPE REQUIRED
     DESCRIPTION "Qt wrapper arround Matrix API"
diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index 4e0320032..fa1381b17 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -372,7 +372,7 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                     }
                     if (e.avatarUrl().isEmpty()) {
                         text += i18n("cleared their avatar");
-                    } else if (e.prevContent()->avatarUrl.isEmpty()) {
+                    } else if (e.prevContent()->avatarUrl) {
                         text += i18n("set an avatar");
                     } else {
                         text += i18n("updated their avatar");
diff --git a/src/userlistmodel.cpp b/src/userlistmodel.cpp
index c1914a5d9..a90cb91aa 100644
--- a/src/userlistmodel.cpp
+++ b/src/userlistmodel.cpp
@@ -50,7 +50,9 @@ void UserListModel::setRoom(Quotient::Room *room)
             std::sort(m_users.begin(), m_users.end(), room->memberSorter());
         }
         for (User *user : qAsConst(m_users)) {
-            connect(user, &User::avatarChanged, this, &UserListModel::avatarChanged);
+            connect(user, &User::defaultAvatarChanged, this, [this, &user]() {
+                avatarChanged(user, m_currentRoom);
+            });
         }
         connect(m_currentRoom->connection(), &Connection::loggedOut, this, [=] {
             setRoom(nullptr);
@@ -149,7 +151,9 @@ void UserListModel::userAdded(Quotient::User *user)
     beginInsertRows(QModelIndex(), pos, pos);
     m_users.insert(pos, user);
     endInsertRows();
-    connect(user, &Quotient::User::avatarChanged, this, &UserListModel::avatarChanged);
+    connect(user, &User::defaultAvatarChanged, this, [this, &user]() {
+        avatarChanged(user, m_currentRoom);
+    });
 }
 
 void UserListModel::userRemoved(Quotient::User *user)