emacs-jabber jabber-vcard-avatars.el, 1.9, 1.10 jabber-avatar.el, 1.8, 1.9

[Magnus H. <leg...@us...>]

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv30056

Modified Files:
	jabber-vcard-avatars.el jabber-avatar.el 
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-379
Creator:  Magnus Henoch <ma...@fr...>

Display avatar warnings only when jabber-avatar-verbose is set


Index: jabber-avatar.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-avatar.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- jabber-avatar.el	8 Aug 2007 10:58:39 -0000	1.8
+++ jabber-avatar.el	8 Aug 2007 11:59:01 -0000	1.9
@@ -45,6 +45,11 @@
   :group 'jabber-avatar
   :type 'directory)
 
+(defcustom jabber-avatar-verbose nil
+  "Display messages about irregularities with other people's avatars."
+  :group 'jabber-avatar
+  :type 'boolean)
+
 ;;;; Avatar data handling
 
 (defstruct avatar sha1-sum mime-type url base64-data height width bytes)
@@ -162,7 +167,8 @@
       (make-directory jabber-avatar-cache-directory))
 
     (if (file-exists-p filename)
-	(message "Caching avatar, but %s already exists" filename)
+	(when jabber-avatar-verbose
+	  (message "Caching avatar, but %s already exists" filename))
       (with-current-buffer buffer
 	(let ((require-final-newline nil))
 	  (setq buffer-file-coding-system 'binary)

Index: jabber-vcard-avatars.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-vcard-avatars.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- jabber-vcard-avatars.el	8 Aug 2007 10:58:51 -0000	1.9
+++ jabber-vcard-avatars.el	8 Aug 2007 11:59:01 -0000	1.10
@@ -78,10 +78,11 @@
 	(let ((avatar (jabber-avatar-from-base64-string (nth 2 photo)
 							(nth 1 photo))))
 	  (unless (string= sha1-hash (avatar-sha1-sum avatar))
-	    (message "%s's avatar should have SHA1 sum %s, but has %s"
-		     (jabber-jid-displayname from)
-		     sha1-hash
-		     (avatar-sha1-sum avatar)))
+	    (when jabber-avatar-verbose
+	      (message "%s's avatar should have SHA1 sum %s, but has %s"
+		       (jabber-jid-displayname from)
+		       sha1-hash
+		       (avatar-sha1-sum avatar))))
 	  (jabber-avatar-cache avatar)
 	  (jabber-avatar-set from avatar))
       (jabber-avatar-set from nil))))