From 345eb0c2293ec79d01d404f055e21ae349f28bfe Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Tue, 16 Feb 2021 21:14:47 +0100
Subject: [PATCH] Revert "Bump dependencies to libQuotient 0.7 (master)"

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fd27e4b3..cc08d36ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,7 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
     find_package(KF5DBusAddons ${KF5_MIN_VERSION} REQUIRED)
 endif()
 
-find_package(Quotient 0.7)
+find_package(Quotient 0.6)
 set_package_properties(Quotient PROPERTIES
     TYPE REQUIRED
     DESCRIPTION "Qt wrapper arround Matrix API"
diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index 60d6ba8e9..2644ecc0b 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -412,7 +412,9 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                     }
                     if (!e.newAvatarUrl().has_value()) {
                         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");
                     }
                 }
diff --git a/src/userlistmodel.cpp b/src/userlistmodel.cpp
index a90cb91aa..c1914a5d9 100644
--- a/src/userlistmodel.cpp
+++ b/src/userlistmodel.cpp
@@ -50,9 +50,7 @@ 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::defaultAvatarChanged, this, [this, &user]() {
-                avatarChanged(user, m_currentRoom);
-            });
+            connect(user, &User::avatarChanged, this, &UserListModel::avatarChanged);
         }
         connect(m_currentRoom->connection(), &Connection::loggedOut, this, [=] {
             setRoom(nullptr);
@@ -151,9 +149,7 @@ void UserListModel::userAdded(Quotient::User *user)
     beginInsertRows(QModelIndex(), pos, pos);
     m_users.insert(pos, user);
     endInsertRows();
-    connect(user, &User::defaultAvatarChanged, this, [this, &user]() {
-        avatarChanged(user, m_currentRoom);
-    });
+    connect(user, &Quotient::User::avatarChanged, this, &UserListModel::avatarChanged);
 }
 
 void UserListModel::userRemoved(Quotient::User *user)