[Emacs-diffs] [emacs] 01/02: lisp/gnus/gnus-notifications.el (gnus-notifications-notify): Provide both app-icon and image-path

[Katsumi Yamaoka]

yamaoka pushed a commit to branch master
in repository emacs.

commit 4af97e67819831ca0b92600232aae8e99aeb0592
Author: Julien Danjou <address@hidden>
Date:   Thu Nov 13 22:11:48 2014 +0000

    lisp/gnus/gnus-notifications.el (gnus-notifications-notify): Provide both 
app-icon and image-path
---
 lisp/gnus/ChangeLog             |    9 +++++++--
 lisp/gnus/gnus-notifications.el |    6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 18588eb..9ed0032 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,7 +1,12 @@
+2014-11-13  Julien Danjou  <address@hidden>
+
+       * gnus-notifications.el (gnus-notifications-notify): Provide both
+       app-icon and image-path.
+
 2014-11-10  Kenjiro NAKAYAMA  <address@hidden>
 
-        * gnus/mm-url.el (mm-url-encode-multipart-form-data):
-        Restore to handle "multipart/form-data" by eww.
+       * gnus/mm-url.el (mm-url-encode-multipart-form-data):
+       Restore to handle "multipart/form-data" by eww.
 
 2014-11-07  Tassilo Horn  <address@hidden>
 
diff --git a/lisp/gnus/gnus-notifications.el b/lisp/gnus/gnus-notifications.el
index ee1083d..0729ea2 100644
--- a/lisp/gnus/gnus-notifications.el
+++ b/lisp/gnus/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)