[gnome-shell/gnome-3-30] notificationDaemon: support file:// or icon theme names for image-path

[Florian Müllner <fmuellner src gnome org>]

commit fd75921f1367648c24684d3cf009d80526906dd1
Author: Marco Trevisan (Treviño) <mail 3v1n0 net>
Date:   Fri Nov 9 08:01:28 2018 +0000

    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
    
    
    (cherry picked from commit 33b8537bf5ba04f6f67b7f5a2e407c8dafd9ef95)

 js/ui/notificationDaemon.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index 81d3e3ae3..defb02fa3 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -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) {