diff --git a/src/notificationsmanager.cpp b/src/notificationsmanager.cpp index 7fbeb43a2..07180d40d 100644 --- a/src/notificationsmanager.cpp +++ b/src/notificationsmanager.cpp @@ -31,12 +31,7 @@ NotificationsManager::NotificationsManager(QObject *parent) { } -void NotificationsManager::postNotification(NeoChatRoom *room, - const QString &roomName, - const QString &sender, - const QString &text, - const QImage &icon, - const QString &replyEventId) +void NotificationsManager::postNotification(NeoChatRoom *room, const QString &sender, const QString &text, const QImage &icon, const QString &replyEventId) { if (!NeoChatConfig::self()->showNotifications()) { return; @@ -46,10 +41,10 @@ void NotificationsManager::postNotification(NeoChatRoom *room, img.convertFromImage(icon); KNotification *notification = new KNotification("message"); - if (sender == roomName) { + if (sender == room->displayName()) { notification->setTitle(sender); } else { - notification->setTitle(i18n("%1 (%2)", sender, roomName)); + notification->setTitle(i18n("%1 (%2)", sender, room->displayName())); } notification->setText(text.toHtmlEscaped()); diff --git a/src/notificationsmanager.h b/src/notificationsmanager.h index fde1d72b6..6144381b3 100644 --- a/src/notificationsmanager.h +++ b/src/notificationsmanager.h @@ -19,8 +19,7 @@ class NotificationsManager : public QObject public: static NotificationsManager &instance(); - Q_INVOKABLE void - postNotification(NeoChatRoom *room, const QString &roomName, const QString &sender, const QString &text, const QImage &icon, const QString &replyEventId); + Q_INVOKABLE void postNotification(NeoChatRoom *room, const QString &sender, const QString &text, const QImage &icon, const QString &replyEventId); void postInviteNotification(NeoChatRoom *room, const QString &title, const QString &sender, const QImage &icon); private: diff --git a/src/roomlistmodel.cpp b/src/roomlistmodel.cpp index 85bba262f..9f09b6188 100644 --- a/src/roomlistmodel.cpp +++ b/src/roomlistmodel.cpp @@ -236,7 +236,6 @@ void RoomListModel::handleNotifications() avatar_image = room->avatar(128); } NotificationsManager::instance().postNotification(dynamic_cast(room), - room->displayName(), sender->displayname(room), notification["event"].toObject()["content"].toObject()["body"].toString(), avatar_image,