diff --git a/src/gui/tray/NotificationHandler.cpp b/src/gui/tray/NotificationHandler.cpp index 70401b21f..445d0a88a 100644 --- a/src/gui/tray/NotificationHandler.cpp +++ b/src/gui/tray/NotificationHandler.cpp @@ -92,7 +92,7 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j auto json = element.toObject(); a._type = Activity::NotificationType; a._accName = ai->account()->displayName(); - a._id = json.value("activity_id").toInt(); + a._id = json.value("notification_id").toInt(); //need to know, specially for remote_share a._objectType = json.value("object_type").toString(); @@ -148,4 +148,4 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j deleteLater(); } -} \ No newline at end of file +} diff --git a/src/gui/tray/UserModel.cpp b/src/gui/tray/UserModel.cpp index c0da8137b..6c6b5f49c 100644 --- a/src/gui/tray/UserModel.cpp +++ b/src/gui/tray/UserModel.cpp @@ -7,6 +7,7 @@ #include "ocsjob.h" #include "configfile.h" #include "notificationconfirmjob.h" +#include "logger.h" #include #include @@ -45,6 +46,8 @@ User::User(AccountStatePtr &account, const bool &isCurrent, QObject *parent) connect(_account->account().data(), &Account::accountChangedDisplayName, this, &User::nameChanged); connect(FolderMan::instance(), &FolderMan::folderListChanged, this, &User::hasLocalFolderChanged); + + connect(this, &User::guiLog, Logger::instance(), &Logger::guiLog); } void User::slotBuildNotificationDisplay(const ActivityList &list)