Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17:/tmp/cvs-serv31917
Modified Files:
jabber-avatar.el
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-372
Creator: Magnus Henoch <ma...@fr...>
Fix bug for avatars without '.' in file name
Index: jabber-avatar.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-avatar.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jabber-avatar.el 12 Apr 2006 12:32:56 -0000 1.6
+++ jabber-avatar.el 5 Aug 2007 21:57:50 -0000 1.7
@@ -71,8 +71,8 @@
(let ((data (with-temp-buffer
(insert-file-contents-literally filename)
(buffer-string)))
- (mime-type (progn (string-match "\\.[^.]+$" filename)
- (mailcap-extension-to-mime (match-string 0 filename)))))
+ (mime-type (when (string-match "\\.[^.]+$" filename)
+ (mailcap-extension-to-mime (match-string 0 filename)))))
(jabber-avatar-from-data data nil mime-type)))
(defun jabber-avatar-from-base64-string (base64-string &optional mime-type)
|
