notificationDaemon: support file:// or icon theme names for image-path
While this sounds counter-intuitive, the image-path hint value might also be used with URIs or icon names. As per freedesktop standard: The "app_icon" parameter and "image-path" hint should be either an URI (file:// is the only URI schema supported right now) or a name in a freedesktop.org-compliant icon theme (not a GTK+ stock ID). Thus the image-path hint should also be parsed as it happens for the app_icon. Reuse same logic, by falling back on _iconForNotificationData with the hint value. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/285
This commit is contained in:
parent
361cc6cf92
commit
33b8537bf5
@ -77,10 +77,8 @@ var FdoNotificationDaemon = new Lang.Class({
|
||||
bitsPerSample, nChannels, data] = hints['image-data'];
|
||||
return Shell.util_create_pixbuf_from_data(data, GdkPixbuf.Colorspace.RGB, hasAlpha,
|
||||
bitsPerSample, width, height, rowStride);
|
||||
} else if (hints['image-path']) {
|
||||
return new Gio.FileIcon({ file: Gio.File.new_for_path(hints['image-path']) });
|
||||
}
|
||||
return null;
|
||||
return this._iconForNotificationData(hints['image-path']);
|
||||
},
|
||||
|
||||
_fallbackIconForNotificationData(hints) {
|
||||
|
Loading…
Reference in New Issue
Block a user