summaryrefslogtreecommitdiff
path: root/lisp/gnus
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/gnus')
-rw-r--r--lisp/gnus/ChangeLog9
-rw-r--r--lisp/gnus/gnus-notifications.el6
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 18588ebc35c..9ed0032f259 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,7 +1,12 @@
+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>
- * 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 <tsdh@gnu.org>
diff --git a/lisp/gnus/gnus-notifications.el b/lisp/gnus/gnus-notifications.el
index ee1083d8005..0729ea25c1a 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)