summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/gnus-notifications.el8
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1c76a179afd..8793ea14f5a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-16 Julien Danjou <julien@danjou.info>
+
+ * gnus-notifications.el (gnus-notifications-notify): Use photo-file as
+ app-icon.
+
2013-05-15 Glenn Morris <rgm@gnu.org>
* shr-color.el (shr-color-visible-luminance-min)
diff --git a/lisp/gnus/gnus-notifications.el b/lisp/gnus/gnus-notifications.el
index f29bdb7b05c..93220ed8ddf 100644
--- a/lisp/gnus/gnus-notifications.el
+++ b/lisp/gnus/gnus-notifications.el
@@ -92,12 +92,12 @@ Return a notification id if any, or t on success."
:body subject
:actions '("read" "Read")
:on-action 'gnus-notifications-action
- :app-icon (gnus-funcall-no-warning
- 'image-search-load-path "gnus/gnus.png")
+ :app-icon (or photo-file
+ (gnus-funcall-no-warning
+ 'image-search-load-path "gnus/gnus.png"))
:app-name "Gnus"
:category "email.arrived"
- :timeout gnus-notifications-timeout
- :image-path photo-file)
+ :timeout gnus-notifications-timeout)
(message "New message from %s: %s" from subject)
;; Don't return an id
t))