Merge from emacs-24; up to 2012-12-29T06:14:00Z!cyd@gnu.org

[gnu-emacs] / lisp / gnus / gnus-notifications.el

diff --git a/lisp/gnus/gnus-notifications.el b/lisp/gnus/gnus-notifications.el
index 224b59b05125393bc0297965a3abe5456231ad87..93220ed8ddf8cdfb11ede4d1fae5fba456427961 100644 (file)
--- a/lisp/gnus/gnus-notifications.el
+++ b/lisp/gnus/gnus-notifications.el
@@ -64,7 +64,8 @@ not get notifications."
 
 (defcustom gnus-notifications-timeout nil
   "Timeout used for notifications sent via `notifications-notify'."
-  :type 'integer
+  :type '(choice (const :tag "Server default" nil)
+                 (integer :tag "Milliseconds"))
   :group 'gnus-notifications)
 
 (defvar gnus-notifications-sent nil
@@ -91,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))