Merge branch 'jb50910' into 'master'

[commhistoryd] Add contact avatar images to notifications. Contributes to JB#50910 See merge request mer-core/commhistory-daemon!44
sailfishos · Sep 11, 2020 · 3a97a31 · 3a97a31
2 parents 828a4b1 + 8fdb628
commit 3a97a31
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/rpm/commhistory-daemon.spec b/rpm/commhistory-daemon.spec
@@ -11,7 +11,7 @@ BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Contacts)
 BuildRequires:  pkgconfig(Qt5Versit)
 BuildRequires:  pkgconfig(Qt5Test)
-BuildRequires:  pkgconfig(commhistory-qt5) >= 1.9.33
+BuildRequires:  pkgconfig(commhistory-qt5) >= 1.10.2
 BuildRequires:  pkgconfig(contactcache-qt5)
 BuildRequires:  pkgconfig(qtcontacts-sqlite-qt5-extensions)
 BuildRequires:  pkgconfig(TelepathyQt5)

diff --git a/src/personalnotification.cpp b/src/personalnotification.cpp
@@ -165,6 +165,7 @@ void PersonalNotification::publishNotification()
     m_notification->setHintValue("x-commhistoryd-data", serialized().toBase64());
     m_notification->setSummary(name);
     m_notification->setBody(notificationText());
+    m_notification->setIcon(m_recipient.contactAvatarUrl().toString());
 
     NotificationManager::instance()->setNotificationProperties(m_notification, this, false);