[Emacs-diffs] /srv/bzr/emacs/trunk r112614: gnus-notifications.el (gnus-notifications-notify): Use photo-file as app-icon

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 112614
author: Julien Danjou <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2013-05-16 22:31:47 +0000
message:
  gnus-notifications.el (gnus-notifications-notify): Use photo-file as app-icon
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-notifications.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-05-15 23:55:41 +0000
+++ b/lisp/gnus/ChangeLog       2013-05-16 22:31:47 +0000
@@ -1,3 +1,8 @@
+2013-05-16  Julien Danjou  <address@hidden>
+
+       * gnus-notifications.el (gnus-notifications-notify): Use photo-file as
+       app-icon.
+
 2013-05-15  Glenn Morris  <address@hidden>
 
        * shr-color.el (shr-color-visible-luminance-min)

=== modified file 'lisp/gnus/gnus-notifications.el'
--- a/lisp/gnus/gnus-notifications.el   2013-05-09 01:40:20 +0000
+++ b/lisp/gnus/gnus-notifications.el   2013-05-16 22:31:47 +0000
@@ -92,12 +92,12 @@
        :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))