summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Danjou <julien@danjou.info>2013-05-16 22:31:47 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2013-05-16 22:31:47 +0000
commit46cd302842975e63f7ed05c0dc25c92c374f2e79 (patch)
treef1208de0cf4469dc768a1ae229fced8ca522d83e
parent04d360e7bb114321e9b9e35f6e8edb8ec0766f18 (diff)
downloademacs-46cd302842975e63f7ed05c0dc25c92c374f2e79.tar.gz
gnus-notifications.el (gnus-notifications-notify): Use photo-file as app-icon
-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))