X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fgnus-notifications.el;h=2941cc46e4a3f69a1a3f805c0e7b533b747c5417;hp=3848dee8d4f4c0ae83170d342665810ae8f5f5e1;hb=dd2bbb95234eb1d65e1a3a504f40339a4be85418;hpb=57f5db3978bdf010b90cd2be4e1910ec46117cb6

diff --git a/lisp/gnus-notifications.el b/lisp/gnus-notifications.el
index 3848dee8d..2941cc46e 100644
--- a/lisp/gnus-notifications.el
+++ b/lisp/gnus-notifications.el
@@ -1,6 +1,6 @@
 ;; gnus-notifications.el -- Send notification on new message in Gnus
 
-;; Copyright (C) 2012 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2015 Free Software Foundation, Inc.
 
 ;; Author: Julien Danjou <julien@danjou.info>
 ;; Keywords: news
@@ -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
@@ -92,15 +93,18 @@ Return a notification id if any, or t on success."
        :actions '("read" "Read")
        :on-action 'gnus-notifications-action
        :app-icon (gnus-funcall-no-warning
-		  'image-search-load-path "gnus/gnus.png")
+                  'image-search-load-path "gnus/gnus.png")
+       :image-path photo-file
        :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))
 
+(declare-function gravatar-retrieve-synchronously "gravatar.el"
+		  (mail-address))
+
 (defun gnus-notifications-get-photo (mail-address)
   "Get photo for mail address."
   (let ((google-photo (when (and gnus-notifications-use-google-contacts