emacs-jabber jabber-vcard-avatars.el,1.11,1.12

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

Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6438

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

Fix interactive use of jabber-vcard-avatars-fetch


Index: jabber-vcard-avatars.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-vcard-avatars.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- jabber-vcard-avatars.el	27 May 2008 01:12:21 -0000	1.11
+++ jabber-vcard-avatars.el	30 May 2008 20:43:14 -0000	1.12
@@ -69,7 +69,8 @@
 (defun jabber-vcard-avatars-fetch (jc who sha1-hash)
   "Fetch WHO's vCard, and extract avatar."
   (interactive (list (jabber-read-account)
-		     (jabber-read-jid-completing "Fetch whose vCard avatar: ")))
+		     (jabber-read-jid-completing "Fetch whose vCard avatar: ")
+		     nil))
   (jabber-send-iq jc who "get" '(vCard ((xmlns . "vcard-temp")))
 		  #'jabber-vcard-avatars-vcard (cons who sha1-hash)
 		  #'ignore nil))
@@ -82,7 +83,8 @@
     (if photo
 	(let ((avatar (jabber-avatar-from-base64-string (nth 2 photo)
 							(nth 1 photo))))
-	  (unless (string= sha1-hash (avatar-sha1-sum avatar))
+	  (unless (or (null sha1-hash)
+		      (string= 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)