brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

notifications: Never use source icon for notifications

Browse Source 
With the new design we will show the source icon in the header of a
notification.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3103>
This commit is contained in:
Julian Sparber
2023-12-06 20:37:56 +01:00
committed by Marge Bot
parent f3cd0aa082
commit eb9118674d
4 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/ui/notificationDaemon.js
View File

@ -212,12 +212,8 @@ class FdoNotificationDaemon {
});
}
// 'image-data' (or 'image-path') takes precedence over 'app-icon'.
let gicon = this._imageForNotificationData(hints);
if (!gicon)
gicon = this._iconForNotificationData(appIcon);
if (!gicon)
gicon = this._fallbackIconForNotificationData(hints);
@ -278,7 +274,8 @@ class FdoNotificationDaemon {
? MessageTray.PrivacyScope.SYSTEM
: MessageTray.PrivacyScope.USER);
let sourceGIcon = source.useNotificationIcon ? gicon : null;
// Only fallback to 'app-icon' when the source doesn't have a valid app
const sourceGIcon = source.app ? null : this._iconForNotificationData(appIcon);
source.processNotification(notification, sourceGIcon);
}
@ -337,8 +334,6 @@ class FdoNotificationDaemonSource extends MessageTray.Source {
if (this.app)
this.title = this.app.get_name();
else
this.useNotificationIcon = true;
if (sender) {
this._nameWatcherId = Gio.DBus.session.watch_name(sender,