[gnus git] branch master updated: m0-7-13-g6a2843a =1= gnus-notifications: use photo-file as app-icon

       via  6a2843ac1260897fd7b4ae3c422b32fa83d37778 (commit)
      from  ef1326b8002fb0513ee5ff9c522b26ab6bf41587 (commit)


- Log -----------------------------------------------------------------
commit 6a2843ac1260897fd7b4ae3c422b32fa83d37778
Author: Julien Danjou <[email protected]>
Date:   Thu May 16 17:51:47 2013 +0200

    gnus-notifications: use photo-file as app-icon
    
    Signed-off-by: Julien Danjou <[email protected]>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca0a60d..24967e8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-16  Julien Danjou  <[email protected]>
+
+	* gnus-notifications.el (gnus-notifications-notify): Use photo-file as
+	app-icon.
+
 2013-05-15  Glenn Morris  <[email protected]>
 
 	* shr-color.el (shr-color-visible-luminance-min)
diff --git a/lisp/gnus-notifications.el b/lisp/gnus-notifications.el
index f29bdb7..93220ed 100644
--- a/lisp/gnus-notifications.el
+++ b/lisp/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))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog             |    5 +++++
 lisp/gnus-notifications.el |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project