emacs-jabber jabber-avatar.el,1.7,1.8

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

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

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

Don't save avatar if already cached


Index: jabber-avatar.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-avatar.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jabber-avatar.el	5 Aug 2007 21:57:50 -0000	1.7
+++ jabber-avatar.el	8 Aug 2007 10:58:39 -0000	1.8
@@ -1,6 +1,6 @@
 ;;; jabber-avatar.el --- generic functions for avatars
 
-;; Copyright (C) 2006  Magnus Henoch
+;; Copyright (C) 2006, 2007  Magnus Henoch
 
 ;; Author: Magnus Henoch <ma...@fr...>
 
@@ -161,15 +161,17 @@
     (unless (file-directory-p jabber-avatar-cache-directory)
       (make-directory jabber-avatar-cache-directory))
 
-    (with-current-buffer buffer
-      (let ((require-final-newline nil))
-	(setq buffer-file-coding-system 'binary)
-	(if (fboundp 'set-buffer-multibyte)
-	    (set-buffer-multibyte nil))
-	(set-visited-file-name filename t)
-	(insert base64-data)
-	(base64-decode-region (point-min) (point-max))
-	(basic-save-buffer)))
+    (if (file-exists-p filename)
+	(message "Caching avatar, but %s already exists" filename)
+      (with-current-buffer buffer
+	(let ((require-final-newline nil))
+	  (setq buffer-file-coding-system 'binary)
+	  (if (fboundp 'set-buffer-multibyte)
+	      (set-buffer-multibyte nil))
+	  (set-visited-file-name filename t)
+	  (insert base64-data)
+	  (base64-decode-region (point-min) (point-max))
+	  (basic-save-buffer))))
     (kill-buffer buffer)))
 
 ;;;; Set avatar for contact