gnus-notifications: use both photo and app-icon

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4bae4ad..a9a5f61 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-13  Julien Danjou  <jd@abydos>
+
+       * gnus-notifications.el (gnus-notifications-notify): Provide both
+       app-icon and image-path.
+
 2014-11-10  Kenjiro NAKAYAMA  <nakayamakenjiro@gmail.com>
 
        * mm-url.el (mm-url-encode-multipart-form-data):

diff --git a/lisp/gnus-notifications.el b/lisp/gnus-notifications.el
index ee1083d..0729ea2 100644 (file)
--- a/lisp/gnus-notifications.el
+++ b/lisp/gnus-notifications.el
@@ -92,9 +92,9 @@ Return a notification id if any, or t on success."
        :body subject
        :actions '("read" "Read")
        :on-action 'gnus-notifications-action
-       :app-icon (or photo-file
-                     (gnus-funcall-no-warning
-                      'image-search-load-path "gnus/gnus.png"))
+       :app-icon (gnus-funcall-no-warning
+                  'image-search-load-path "gnus/gnus.png")
+       :image-path photo-file
        :app-name "Gnus"
        :category "email.arrived"
        :timeout gnus-notifications-timeout)